Partial fix to DIRSERVER_1728: interceptor-kerberos

apache · Aug 20, 2024 · 529614a · 529614a
1 parent de20599
commit 529614a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java b/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java
@@ -267,6 +267,9 @@ public enum I18n
     // apacheds-installers-maven-plugins errors      11000 - 11999
 
     // apacheds-interceptor-kerberos errors          12000 - 12999
+    ERR_12000_ERROR_ENCODING_ENCRYPTION_KEY("ERR_12000_ERROR_ENCODING_ENCRYPTION_KEY"),
+    ERR_12001_FAILED_TO_AUTHENTICATE_USER("ERR_12001_FAILED_TO_AUTHENTICATE_USER"),
+
     // apacheds-interceptors-admin errors            13000 - 13999
     // apacheds-interceptors-authn errors            14000 - 14999
     // apacheds-interceptors-authz errors            15000 - 15999
@@ -514,7 +517,6 @@ public enum I18n
     ERR_113_COULD_NOT_DELETE_FILE_OR_DIRECTORY("ERR_113_COULD_NOT_DELETE_FILE_OR_DIRECTORY"),
     ERR_115("ERR_115"),
     ERR_116("ERR_116"),
-    ERR_122("ERR_122"),
     ERR_128("ERR_128"),
     ERR_135("ERR_135"),
     ERR_136("ERR_136"),
@@ -656,7 +658,6 @@ public enum I18n
     ERR_509("ERR_509"),
     ERR_510("ERR_510"),
     ERR_511("ERR_511"),
-    ERR_512("ERR_512"),
     ERR_513("ERR_513"),
     ERR_514("ERR_514"),
     ERR_515("ERR_515"),

diff --git a/i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties b/i18n/src/main/resources/org/apache/directory/server/i18n/errors.properties
@@ -258,6 +258,10 @@ ERR_09001_FAILED_TO_CONFIGURE_WEB_APPLICATION=Failed to configure the web applic
 # apacheds-installers-maven-plugins errors      11000 - 11999
 
 # apacheds-interceptor-kerberos errors          12000 - 12999
+ERR_12000_ERROR_ENCODING_ENCRYPTION_KEY=Error encoding EncryptionKey.
+ERR_12001_FAILED_TO_AUTHENTICATE_USER=Failed to authenticate user ''{0}''.
+
+
 # apacheds-interceptors-admin errors            13000 - 13999
 # apacheds-interceptors-authn errors            14000 - 14999
 # apacheds-interceptors-authz errors            15000 - 15999
@@ -529,7 +533,6 @@ ERR_89=NameForm loading NYI
 ERR_113_COULD_NOT_DELETE_FILE_OR_DIRECTORY=Could not delete file or directory {0}
 ERR_115=Failed to delete the working directory.
 ERR_116=Failed to delete\: 
-ERR_122=Error encoding EncryptionKey.
 # ERR_123=
 ERR_128=Failed to identify OID for\: 
 # ERR_129=
@@ -695,7 +698,6 @@ ERR_508=Cannot overwrite, config output directory already exists: {0}
 ERR_509=Cannot copy non-existant source file {0}
 ERR_510=Should not be hitting root without config/config pattern.
 ERR_511=parent cannot be null
-ERR_512=Failed to authenticate user ''{0}''.
 ERR_513=Error during underflow [{0}]
 ERR_514=Key not found: {0}
 ERR_515=BPage not ordered

diff --git a/...ros/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java b/...ros/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
@@ -314,7 +314,7 @@ private void lookupPrincipalAttributes( ModifyOperationContext modContext, Modif
 
         if ( userEntry == null )
         {
-            throw new LdapAuthenticationException( I18n.err( I18n.ERR_512, principalDn ) );
+            throw new LdapAuthenticationException( I18n.err( I18n.ERR_12001_FAILED_TO_AUTHENTICATE_USER, principalDn ) );
         }
 
         if ( !( ( ClonedServerEntry ) userEntry ).getOriginalEntry().contains(
@@ -442,8 +442,8 @@ private Attribute getKeyAttribute( Map<EncryptionType, EncryptionKey> keys )
             }
             catch ( EncoderException ioe )
             {
-                LOG.error( I18n.err( I18n.ERR_122 ), ioe );
-                LOG_KRB.error( I18n.err( I18n.ERR_122 ), ioe );
+                LOG.error( I18n.err( I18n.ERR_12000_ERROR_ENCODING_ENCRYPTION_KEY ), ioe );
+                LOG_KRB.error( I18n.err( I18n.ERR_12000_ERROR_ENCODING_ENCRYPTION_KEY ), ioe );
             }
         }