(file) Return to SecurityPropertyOwner.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Config

Diff for /pegasus/src/Pegasus/Config/SecurityPropertyOwner.cpp between version 1.58 and 1.59

version 1.58, 2006/09/29 17:38:14 version 1.59, 2006/11/14 18:34:50
Line 88 
Line 88 
     {"sslCertificateFilePath", "cert.pem", IS_STATIC, 0, 0, IS_VISIBLE},     {"sslCertificateFilePath", "cert.pem", IS_STATIC, 0, 0, IS_VISIBLE},
 #else #else
 # ifdef PEGASUS_OS_OS400 # ifdef PEGASUS_OS_OS400
     {"sslCertificateFilePath", "ssl/keystore/servercert.pem", IS_STATIC, 0, 0, IS_VISIBLE},      {"sslCertificateFilePath",
            "ssl/keystore/servercert.pem", IS_STATIC, 0, 0, IS_VISIBLE},
 # else # else
     {"sslCertificateFilePath", "server.pem", IS_STATIC, 0, 0, IS_VISIBLE},     {"sslCertificateFilePath", "server.pem", IS_STATIC, 0, 0, IS_VISIBLE},
 # endif # endif
 #endif #endif
 #ifdef PEGASUS_OS_OS400 #ifdef PEGASUS_OS_OS400
     {"sslKeyFilePath", "ssl/keystore/serverkey.pem", IS_STATIC, 0, 0, IS_VISIBLE},      {"sslKeyFilePath",
            "ssl/keystore/serverkey.pem", IS_STATIC, 0, 0, IS_VISIBLE},
 #else #else
     {"sslKeyFilePath", "file.pem", IS_STATIC, 0, 0, IS_VISIBLE},     {"sslKeyFilePath", "file.pem", IS_STATIC, 0, 0, IS_VISIBLE},
 #endif #endif
Line 126 
Line 128 
 #endif #endif
 #if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_OS_LINUX) #if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_OS_LINUX)
 # ifdef PEGASUS_USE_RELEASE_CONFIG_OPTIONS # ifdef PEGASUS_USE_RELEASE_CONFIG_OPTIONS
     {"enableSubscriptionsForNonprivilegedUsers", "false", IS_STATIC, 0, 0, IS_VISIBLE},      {"enableSubscriptionsForNonprivilegedUsers",
            "false", IS_STATIC, 0, 0, IS_VISIBLE},
 # else # else
     {"enableSubscriptionsForNonprivilegedUsers", "true", IS_STATIC, 0, 0, IS_VISIBLE},      {"enableSubscriptionsForNonprivilegedUsers",
            "true", IS_STATIC, 0, 0, IS_VISIBLE},
 # endif # endif
 #else #else
 # ifdef PEGASUS_OS_OS400 # ifdef PEGASUS_OS_OS400
     {"enableSubscriptionsForNonprivilegedUsers", "false", IS_STATIC, 0, 0, IS_VISIBLE},      {"enableSubscriptionsForNonprivilegedUsers",
            "false", IS_STATIC, 0, 0, IS_VISIBLE},
 # else # else
     {"enableSubscriptionsForNonprivilegedUsers", "true", IS_STATIC, 0, 0, IS_HIDDEN},      {"enableSubscriptionsForNonprivilegedUsers",
            "true", IS_STATIC, 0, 0, IS_HIDDEN},
 # endif # endif
 #endif #endif
 #ifdef PEGASUS_OS_ZOS #ifdef PEGASUS_OS_ZOS
Line 196 
Line 202 
             _enableAuthentication->dynamic = properties[i].dynamic;             _enableAuthentication->dynamic = properties[i].dynamic;
             _enableAuthentication->domain = properties[i].domain;             _enableAuthentication->domain = properties[i].domain;
             _enableAuthentication->domainSize = properties[i].domainSize;             _enableAuthentication->domainSize = properties[i].domainSize;
             _enableAuthentication->externallyVisible = properties[i].externallyVisible;              _enableAuthentication->externallyVisible =
                   properties[i].externallyVisible;
         }         }
         else if (String::equalNoCase(         else if (String::equalNoCase(
             properties[i].propertyName, "enableNamespaceAuthorization"))             properties[i].propertyName, "enableNamespaceAuthorization"))
         {         {
             _enableNamespaceAuthorization->propertyName = properties[i].propertyName;              _enableNamespaceAuthorization->propertyName =
             _enableNamespaceAuthorization->defaultValue = properties[i].defaultValue;                  properties[i].propertyName;
             _enableNamespaceAuthorization->currentValue = properties[i].defaultValue;              _enableNamespaceAuthorization->defaultValue =
             _enableNamespaceAuthorization->plannedValue = properties[i].defaultValue;                  properties[i].defaultValue;
               _enableNamespaceAuthorization->currentValue =
                   properties[i].defaultValue;
               _enableNamespaceAuthorization->plannedValue =
                   properties[i].defaultValue;
             _enableNamespaceAuthorization->dynamic = properties[i].dynamic;             _enableNamespaceAuthorization->dynamic = properties[i].dynamic;
             _enableNamespaceAuthorization->domain = properties[i].domain;             _enableNamespaceAuthorization->domain = properties[i].domain;
             _enableNamespaceAuthorization->domainSize = properties[i].domainSize;              _enableNamespaceAuthorization->domainSize =
             _enableNamespaceAuthorization->externallyVisible = properties[i].externallyVisible;                  properties[i].domainSize;
               _enableNamespaceAuthorization->externallyVisible =
                   properties[i].externallyVisible;
         }         }
         else if (String::equalNoCase(properties[i].propertyName, "httpAuthType"))          else if (String::equalNoCase(
                        properties[i].propertyName, "httpAuthType"))
         {         {
             _httpAuthType->propertyName = properties[i].propertyName;             _httpAuthType->propertyName = properties[i].propertyName;
             _httpAuthType->defaultValue = properties[i].defaultValue;             _httpAuthType->defaultValue = properties[i].defaultValue;
Line 222 
Line 236 
             _httpAuthType->externallyVisible = properties[i].externallyVisible;             _httpAuthType->externallyVisible = properties[i].externallyVisible;
         }         }
         else if (String::equalNoCase(         else if (String::equalNoCase(
                             properties[i].propertyName,                       properties[i].propertyName, "passwordFilePath"))
                             "passwordFilePath"))  
         {         {
             _passwordFilePath->propertyName = properties[i].propertyName;             _passwordFilePath->propertyName = properties[i].propertyName;
             _passwordFilePath->defaultValue = properties[i].defaultValue;             _passwordFilePath->defaultValue = properties[i].defaultValue;
Line 232 
Line 245 
             _passwordFilePath->dynamic = properties[i].dynamic;             _passwordFilePath->dynamic = properties[i].dynamic;
             _passwordFilePath->domain = properties[i].domain;             _passwordFilePath->domain = properties[i].domain;
             _passwordFilePath->domainSize = properties[i].domainSize;             _passwordFilePath->domainSize = properties[i].domainSize;
             _passwordFilePath->externallyVisible = properties[i].externallyVisible;              _passwordFilePath->externallyVisible =
                   properties[i].externallyVisible;
         }         }
         else if (String::equalNoCase(         else if (String::equalNoCase(
                             properties[i].propertyName,                       properties[i].propertyName, "sslCertificateFilePath"))
                             "sslCertificateFilePath"))  
         {         {
             _certificateFilePath->propertyName = properties[i].propertyName;             _certificateFilePath->propertyName = properties[i].propertyName;
             _certificateFilePath->defaultValue = properties[i].defaultValue;             _certificateFilePath->defaultValue = properties[i].defaultValue;
Line 245 
Line 258 
             _certificateFilePath->dynamic = properties[i].dynamic;             _certificateFilePath->dynamic = properties[i].dynamic;
             _certificateFilePath->domain = properties[i].domain;             _certificateFilePath->domain = properties[i].domain;
             _certificateFilePath->domainSize = properties[i].domainSize;             _certificateFilePath->domainSize = properties[i].domainSize;
             _certificateFilePath->externallyVisible = properties[i].externallyVisible;              _certificateFilePath->externallyVisible =
                   properties[i].externallyVisible;
         }         }
         else if (String::equalNoCase(         else if (String::equalNoCase(
                             properties[i].propertyName,                       properties[i].propertyName, "sslKeyFilePath"))
                             "sslKeyFilePath"))  
         {         {
             _keyFilePath->propertyName = properties[i].propertyName;             _keyFilePath->propertyName = properties[i].propertyName;
             _keyFilePath->defaultValue = properties[i].defaultValue;             _keyFilePath->defaultValue = properties[i].defaultValue;
Line 261 
Line 274 
             _keyFilePath->externallyVisible = properties[i].externallyVisible;             _keyFilePath->externallyVisible = properties[i].externallyVisible;
         }         }
         else if (String::equalNoCase(         else if (String::equalNoCase(
                             properties[i].propertyName,                       properties[i].propertyName, "sslTrustStore"))
                 "sslTrustStore"))  
         {         {
             _trustStore->propertyName = properties[i].propertyName;             _trustStore->propertyName = properties[i].propertyName;
             _trustStore->defaultValue = properties[i].defaultValue;             _trustStore->defaultValue = properties[i].defaultValue;
Line 273 
Line 285 
             _trustStore->domainSize = properties[i].domainSize;             _trustStore->domainSize = properties[i].domainSize;
             _trustStore->externallyVisible = properties[i].externallyVisible;             _trustStore->externallyVisible = properties[i].externallyVisible;
  
             // do not initialize trustpath; a truststore is not required for SSL handshakes              // do not initialize trustpath; a truststore is not required
             // a server may wish to connect on HTTPS but not verify clients              // for SSL handshakes a server may wish to connect on HTTPS
               // but not verify clients
         }         }
 #ifdef PEGASUS_ENABLE_SSL_CRL_VERIFICATION #ifdef PEGASUS_ENABLE_SSL_CRL_VERIFICATION
         else if (String::equalNoCase(         else if (String::equalNoCase(
                             properties[i].propertyName,                       properties[i].propertyName, "crlStore"))
                 "crlStore"))  
         {         {
             _crlStore->propertyName = properties[i].propertyName;             _crlStore->propertyName = properties[i].propertyName;
             _crlStore->defaultValue = properties[i].defaultValue;             _crlStore->defaultValue = properties[i].defaultValue;
Line 295 
Line 307 
         else if (String::equalNoCase(         else if (String::equalNoCase(
             properties[i].propertyName, "sslClientVerificationMode"))             properties[i].propertyName, "sslClientVerificationMode"))
         {         {
             _sslClientVerificationMode->propertyName = properties[i].propertyName;              _sslClientVerificationMode->propertyName =
             _sslClientVerificationMode->defaultValue = properties[i].defaultValue;                  properties[i].propertyName;
             _sslClientVerificationMode->currentValue = properties[i].defaultValue;              _sslClientVerificationMode->defaultValue =
             _sslClientVerificationMode->plannedValue = properties[i].defaultValue;                  properties[i].defaultValue;
               _sslClientVerificationMode->currentValue =
                   properties[i].defaultValue;
               _sslClientVerificationMode->plannedValue =
                   properties[i].defaultValue;
             _sslClientVerificationMode->dynamic = properties[i].dynamic;             _sslClientVerificationMode->dynamic = properties[i].dynamic;
             _sslClientVerificationMode->domain = properties[i].domain;             _sslClientVerificationMode->domain = properties[i].domain;
             _sslClientVerificationMode->domainSize = properties[i].domainSize;             _sslClientVerificationMode->domainSize = properties[i].domainSize;
             _sslClientVerificationMode->externallyVisible = properties[i].externallyVisible;              _sslClientVerificationMode->externallyVisible =
                   properties[i].externallyVisible;
         }         }
         else if (String::equalNoCase(         else if (String::equalNoCase(
             properties[i].propertyName, "sslTrustStoreUserName"))             properties[i].propertyName, "sslTrustStoreUserName"))
Line 314 
Line 331 
             _sslTrustStoreUserName->dynamic = properties[i].dynamic;             _sslTrustStoreUserName->dynamic = properties[i].dynamic;
             _sslTrustStoreUserName->domain = properties[i].domain;             _sslTrustStoreUserName->domain = properties[i].domain;
             _sslTrustStoreUserName->domainSize = properties[i].domainSize;             _sslTrustStoreUserName->domainSize = properties[i].domainSize;
             _sslTrustStoreUserName->externallyVisible = properties[i].externallyVisible;              _sslTrustStoreUserName->externallyVisible =
                   properties[i].externallyVisible;
         }         }
         else if (String::equalNoCase(         else if (String::equalNoCase(
             properties[i].propertyName, "enableRemotePrivilegedUserAccess"))             properties[i].propertyName, "enableRemotePrivilegedUserAccess"))
         {         {
             _enableRemotePrivilegedUserAccess->propertyName = properties[i].propertyName;              _enableRemotePrivilegedUserAccess->propertyName =
             _enableRemotePrivilegedUserAccess->defaultValue = properties[i].defaultValue;                  properties[i].propertyName;
             _enableRemotePrivilegedUserAccess->currentValue = properties[i].defaultValue;              _enableRemotePrivilegedUserAccess->defaultValue =
             _enableRemotePrivilegedUserAccess->plannedValue = properties[i].defaultValue;                  properties[i].defaultValue;
               _enableRemotePrivilegedUserAccess->currentValue =
                   properties[i].defaultValue;
               _enableRemotePrivilegedUserAccess->plannedValue =
                   properties[i].defaultValue;
             _enableRemotePrivilegedUserAccess->dynamic = properties[i].dynamic;             _enableRemotePrivilegedUserAccess->dynamic = properties[i].dynamic;
             _enableRemotePrivilegedUserAccess->domain = properties[i].domain;             _enableRemotePrivilegedUserAccess->domain = properties[i].domain;
             _enableRemotePrivilegedUserAccess->domainSize = properties[i].domainSize;              _enableRemotePrivilegedUserAccess->domainSize =
             _enableRemotePrivilegedUserAccess->externallyVisible = properties[i].externallyVisible;                  properties[i].domainSize;
         }              _enableRemotePrivilegedUserAccess->externallyVisible =
         else if (String::equalNoCase(                  properties[i].externallyVisible;
             properties[i].propertyName, "enableSubscriptionsForNonprivilegedUsers"))          }
         {          else if (String::equalNoCase(properties[i].propertyName,
             _enableSubscriptionsForNonprivilegedUsers->propertyName = properties[i].propertyName;                       "enableSubscriptionsForNonprivilegedUsers"))
             _enableSubscriptionsForNonprivilegedUsers->defaultValue = properties[i].defaultValue;          {
             _enableSubscriptionsForNonprivilegedUsers->currentValue = properties[i].defaultValue;              _enableSubscriptionsForNonprivilegedUsers->propertyName =
             _enableSubscriptionsForNonprivilegedUsers->plannedValue = properties[i].defaultValue;                  properties[i].propertyName;
             _enableSubscriptionsForNonprivilegedUsers->dynamic = properties[i].dynamic;              _enableSubscriptionsForNonprivilegedUsers->defaultValue =
             _enableSubscriptionsForNonprivilegedUsers->domain = properties[i].domain;                  properties[i].defaultValue;
             _enableSubscriptionsForNonprivilegedUsers->domainSize = properties[i].domainSize;              _enableSubscriptionsForNonprivilegedUsers->currentValue =
             _enableSubscriptionsForNonprivilegedUsers->externallyVisible = properties[i].externallyVisible;                  properties[i].defaultValue;
               _enableSubscriptionsForNonprivilegedUsers->plannedValue =
                   properties[i].defaultValue;
               _enableSubscriptionsForNonprivilegedUsers->dynamic =
                   properties[i].dynamic;
               _enableSubscriptionsForNonprivilegedUsers->domain =
                   properties[i].domain;
               _enableSubscriptionsForNonprivilegedUsers->domainSize =
                   properties[i].domainSize;
               _enableSubscriptionsForNonprivilegedUsers->externallyVisible =
                   properties[i].externallyVisible;
         }         }
 #ifdef PEGASUS_ENABLE_USERGROUP_AUTHORIZATION #ifdef PEGASUS_ENABLE_USERGROUP_AUTHORIZATION
         else if (String::equalNoCase(properties[i].propertyName, "authorizedUserGroups"))          else if (String::equalNoCase(
                        properties[i].propertyName, "authorizedUserGroups"))
         {         {
             _authorizedUserGroups->propertyName = properties[i].propertyName;             _authorizedUserGroups->propertyName = properties[i].propertyName;
             _authorizedUserGroups->defaultValue = properties[i].defaultValue;             _authorizedUserGroups->defaultValue = properties[i].defaultValue;
Line 350 
Line 383 
             _authorizedUserGroups->dynamic = properties[i].dynamic;             _authorizedUserGroups->dynamic = properties[i].dynamic;
             _authorizedUserGroups->domain = properties[i].domain;             _authorizedUserGroups->domain = properties[i].domain;
             _authorizedUserGroups->domainSize = properties[i].domainSize;             _authorizedUserGroups->domainSize = properties[i].domainSize;
             _authorizedUserGroups->externallyVisible = properties[i].externallyVisible;              _authorizedUserGroups->externallyVisible =
                   properties[i].externallyVisible;
         }         }
 #endif #endif
 #ifdef PEGASUS_KERBEROS_AUTHENTICATION #ifdef PEGASUS_KERBEROS_AUTHENTICATION
         else if (String::equalNoCase(properties[i].propertyName, "kerberosServiceName"))          else if (String::equalNoCase(
                        properties[i].propertyName, "kerberosServiceName"))
         {         {
             _kerberosServiceName->propertyName = properties[i].propertyName;             _kerberosServiceName->propertyName = properties[i].propertyName;
             _kerberosServiceName->defaultValue = properties[i].defaultValue;             _kerberosServiceName->defaultValue = properties[i].defaultValue;
Line 363 
Line 398 
             _kerberosServiceName->dynamic = properties[i].dynamic;             _kerberosServiceName->dynamic = properties[i].dynamic;
             _kerberosServiceName->domain = properties[i].domain;             _kerberosServiceName->domain = properties[i].domain;
             _kerberosServiceName->domainSize = properties[i].domainSize;             _kerberosServiceName->domainSize = properties[i].domainSize;
             _kerberosServiceName->externallyVisible = properties[i].externallyVisible;              _kerberosServiceName->externallyVisible =
                   properties[i].externallyVisible;
         }         }
 #endif #endif
     }     }
Line 377 
Line 413 
     {     {
         return _enableAuthentication.get();         return _enableAuthentication.get();
     }     }
     else if (String::equalNoCase(_enableNamespaceAuthorization->propertyName, name))      else if (String::equalNoCase(
                    _enableNamespaceAuthorization->propertyName, name))
     {     {
         return _enableNamespaceAuthorization.get();         return _enableNamespaceAuthorization.get();
     }     }
Line 562 
Line 599 
 /** /**
 Checks to see if the given value is valid or not. Checks to see if the given value is valid or not.
 */ */
 Boolean SecurityPropertyOwner::isValid(const String& name,  Boolean SecurityPropertyOwner::isValid(
       const String& name,
                              const String& value) const                              const String& value) const
 { {
     Boolean retVal = false;     Boolean retVal = false;
Line 577 
Line 615 
             retVal = true;             retVal = true;
         }         }
     }     }
     else if (String::equalNoCase(_enableNamespaceAuthorization->propertyName, name))      else if (String::equalNoCase(
                    _enableNamespaceAuthorization->propertyName, name))
     {     {
         if(String::equal(value, "true") || String::equal(value, "false"))         if(String::equal(value, "true") || String::equal(value, "false"))
         {         {
Line 760 
Line 799 
  
         return false;         return false;
     }     }
     else if (String::equalNoCase(_sslClientVerificationMode->propertyName, name))      else if (String::equalNoCase(
                    _sslClientVerificationMode->propertyName, name))
     {     {
         if(String::equal(value, "disabled") || String::equal(value, "required") || String::equal(value, "optional"))          if (String::equal(value, "disabled") ||
               String::equal(value, "required") ||
               String::equal(value, "optional"))
         {         {
             retVal = true;             retVal = true;
         }         }
Line 774 
Line 816 
             return true;             return true;
         }         }
     }     }
     else if (String::equalNoCase(_enableRemotePrivilegedUserAccess->propertyName, name))      else if (String::equalNoCase(
                    _enableRemotePrivilegedUserAccess->propertyName, name))
     {     {
         if(String::equal(value, "true") || String::equal(value, "false"))         if(String::equal(value, "true") || String::equal(value, "false"))
         {         {
             retVal = true;             retVal = true;
         }         }
     }     }
     else if (String::equalNoCase(_enableSubscriptionsForNonprivilegedUsers->propertyName, name))      else if (String::equalNoCase(
                    _enableSubscriptionsForNonprivilegedUsers->propertyName, name))
     {     {
         if(String::equal(value, "true") || String::equal(value, "false"))         if(String::equal(value, "true") || String::equal(value, "false"))
         {         {

Legend:
Removed from v.1.58  
changed lines
  Added in v.1.59
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2