snoopdave commented on code in PR #306:
URL: https://github.com/apache/roller/pull/306#discussion_r4608462540


##########
app/src/main/java/org/apache/roller/weblogger/ui/core/security/ExternalLoginAwarePasswordEncoder.java:
##########
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.roller.weblogger.ui.core.security;
+
+import org.apache.roller.weblogger.config.WebloggerConfig;
+import org.springframework.security.crypto.password.PasswordEncoder;
+
+/**
+ * Users who log in through LDAP or the servlet container have no Roller
+ * password; Roller stores users.passwords.externalAuthValue in its place.
+ * That placeholder is not a password, so this encoder never matches it.
+ */
+public class ExternalLoginAwarePasswordEncoder implements PasswordEncoder {
+
+    private final PasswordEncoder delegate;
+
+    public ExternalLoginAwarePasswordEncoder(PasswordEncoder delegate) {
+        this.delegate = delegate;
+    }
+
+    @Override
+    public String encode(CharSequence rawPassword) {
+        return delegate.encode(rawPassword);
+    }
+
+    @Override
+    public boolean matches(CharSequence rawPassword, String encodedPassword) {
+        String marker = 
WebloggerConfig.getProperty("users.passwords.externalAuthValue", 
"<externalAuth>");
+        if (rawPassword != null && marker != null && !marker.isEmpty() && 
marker.contentEquals(rawPassword)) {

Review Comment:
   **Important:** A normal database user can set a password equal to the 
configured marker: registration and password reset accept it, but this check 
then prevents login. Reject that value when setting a database password, and 
provide a way to recover existing accounts that use it.



##########
app/src/main/java/org/apache/roller/weblogger/ui/core/RollerContext.java:
##########
@@ -278,7 +279,7 @@ protected void initializeSecurityFeatures(ServletContext 
context) {
             }
         }
 
-        encoder = createPasswordEncoder();
+        encoder = new 
ExternalLoginAwarePasswordEncoder(createPasswordEncoder());

Review Comment:
   **Important:** The tests construct the wrapper directly, so removing this 
assignment would leave them passing. #304 also tests encoded and plaintext 
placeholders through DaoAuthenticationProvider. Add the equivalent 6.1.x 
provider test to cover this wiring.



##########
app/src/main/java/org/apache/roller/weblogger/ui/core/security/ExternalLoginAwarePasswordEncoder.java:
##########
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.roller.weblogger.ui.core.security;
+
+import org.apache.roller.weblogger.config.WebloggerConfig;
+import org.springframework.security.crypto.password.PasswordEncoder;
+
+/**
+ * Users who log in through LDAP or the servlet container have no Roller
+ * password; Roller stores users.passwords.externalAuthValue in its place.
+ * That placeholder is not a password, so this encoder never matches it.
+ */
+public class ExternalLoginAwarePasswordEncoder implements PasswordEncoder {
+
+    private final PasswordEncoder delegate;
+
+    public ExternalLoginAwarePasswordEncoder(PasswordEncoder delegate) {
+        this.delegate = delegate;
+    }
+
+    @Override
+    public String encode(CharSequence rawPassword) {
+        return delegate.encode(rawPassword);
+    }
+
+    @Override
+    public boolean matches(CharSequence rawPassword, String encodedPassword) {
+        String marker = 
WebloggerConfig.getProperty("users.passwords.externalAuthValue", 
"<externalAuth>");
+        if (rawPassword != null && marker != null && !marker.isEmpty() && 
marker.contentEquals(rawPassword)) {

Review Comment:
   **Important:** WebloggerConfig permits an empty marker, and 
CustomUserRegistry can store it. The `!marker.isEmpty()` condition passes that 
value to the delegate, which accepts it when plaintext lazy upgrade is enabled. 
Reject the configured marker even when empty, and test that configuration.



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]

Reply via email to