Bladeren bron

HPCC-22415 Remove unused options from configuration

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
Gavin Halliday 5 jaren geleden
bovenliggende
commit
aec4eb2e55

+ 1 - 1
dali/base/dasess.cpp

@@ -970,7 +970,7 @@ public:
         {
             //Backwards compatibility in case another parameter is added later, otherwise could be removed
             CDateTime reqUTCTimestamp;
-            mb.append("");
+            mb.append(""); // previously a base64 encoded signature
             reqUTCTimestamp.serialize(mb);
         }
 

+ 0 - 4
dali/server/daldap.cpp

@@ -53,8 +53,6 @@ class CDaliLdapConnection: implements IDaliLdapConnection, public CInterface
     StringAttr              filesdefaultuser;
     StringAttr              filesdefaultpassword;
     unsigned                ldapflags;
-    unsigned                requestSignatureExpiryMinutes;//Age at which a dali permissions request signature becomes invalid
-    unsigned                requestSignatureAllowedClockVarianceSeconds;//Number of seconds that timestamps can vary between nodes
     IDigitalSignatureManager * pDSM = nullptr;
 
     void createDefaultScopes()
@@ -86,8 +84,6 @@ public:
     {
         ldapflags = 0;
         if (ldapprops) {
-            requestSignatureExpiryMinutes = ldapprops->getPropInt("@reqSignatureExpiry", 10);
-            requestSignatureAllowedClockVarianceSeconds = ldapprops->getPropInt("@allowedClockVariance", 5);
             if (ldapprops->getPropBool("@checkScopeScans",true))
                 ldapflags |= DLF_SCOPESCANS;
             if (ldapprops->getPropBool("@safeLookup",true))

+ 0 - 14
initfiles/componentfiles/configxml/dali.xsd

@@ -402,20 +402,6 @@
         </xs:appinfo>
       </xs:annotation>
     </xs:attribute>
-    <xs:attribute name="reqSignatureExpiry" use="optional" type="xs:string" default="10">
-      <xs:annotation>
-        <xs:appinfo>
-          <tooltip>Lifetime in minutes of a permissions request digital signature.</tooltip>
-        </xs:appinfo>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="allowedClockVariance" use="optional" type="xs:string" default="5">
-      <xs:annotation>
-        <xs:appinfo>
-          <tooltip>Maximum number of seconds that client clocks can vary from Dali clock, used when checking permissions request digital signature.</tooltip>
-        </xs:appinfo>
-      </xs:annotation>
-    </xs:attribute>
     <xs:attribute name="checkScopeScans" type="xs:boolean" use="optional" default="true">
       <xs:annotation>
         <xs:appinfo>

+ 1 - 1
initfiles/componentfiles/configxml/dali.xsl

@@ -240,7 +240,7 @@
         </xsl:element>
         <xsl:if test="string(@ldapServer) != ''">
           <xsl:element name="ldapSecurity">
-            <xsl:copy-of select="@ldapProtocol | @authMethod | @maxConnections | @workunitsBasedn | @filesDefaultUser | @filesDefaultPassword | @reqSignatureExpiry | @allowedClockVariance"/>
+            <xsl:copy-of select="@ldapProtocol | @authMethod | @maxConnections | @workunitsBasedn | @filesDefaultUser | @filesDefaultPassword"/>
             <xsl:variable name="ldapServerName" select="@ldapServer"/>
             <xsl:attribute name="filesBasedn">
                 <xsl:value-of select="/Environment/Software/LDAPServerProcess[@name=$ldapServerName]/@filesBasedn"/>