snoopdave commented on code in PR #224:
URL: https://github.com/apache/roller/pull/224#discussion_r4419591372
##########
app/src/main/java/org/apache/roller/weblogger/ui/core/security/RollerUserDetailsService.java:
##########
@@ -53,6 +54,9 @@ public UserDetails loadUserByUsername(String userName) {
} catch (WebloggerException ex) {
throw new DataRetrievalFailureException("ERROR in user
lookup", ex);
}
+ if (userData != null &&
!Boolean.TRUE.equals(userData.getEnabled())) {
+ throw new DisabledException("User account is disabled: " +
userData.getUserName());
Review Comment:
Keep this throw: `OpenIDAuthenticationProvider` (5.8.x) doesn't run a
`UserDetailsChecker`. But both branches below still build the Spring `User`
with `enabled=true` hard-coded (lines 79 and 92). Passing
`userData.getEnabled()` costs nothing and lets Spring's own checks refuse
disabled users in the providers that run them (password, remember-me), even if
a lookup stops filtering on enabled.
##########
app/src/test/java/org/apache/roller/weblogger/ui/core/security/RollerUserDetailsServiceTest.java:
##########
@@ -0,0 +1,85 @@
+/*
+ * 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
+ *
+ * https://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 java.util.List;
+
+import org.apache.roller.weblogger.business.UserManager;
+import org.apache.roller.weblogger.business.Weblogger;
+import org.apache.roller.weblogger.business.WebloggerFactory;
+import org.apache.roller.weblogger.pojos.User;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.MockedStatic;
+import org.springframework.security.authentication.DisabledException;
+import org.springframework.security.core.userdetails.UserDetails;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.mockStatic;
+import static org.mockito.Mockito.when;
+
+/**
+ * Sign-in through an OpenID URL honors the account's enabled flag.
+ */
+class RollerUserDetailsServiceTest {
+
+ private static final String OPENID = "https://id.example.com/reader";;
+
+ private MockedStatic<WebloggerFactory> factory;
+ private UserManager users;
+
+ @BeforeEach
+ void setUp() throws Exception {
+ users = mock(UserManager.class);
+ Weblogger roller = mock(Weblogger.class);
+ when(roller.getUserManager()).thenReturn(users);
+ factory = mockStatic(WebloggerFactory.class);
+ factory.when(WebloggerFactory::getWeblogger).thenReturn(roller);
+ }
+
+ @AfterEach
+ void tearDown() {
+ factory.close();
+ }
+
+ private User user(boolean enabled) throws Exception {
+ User user = new User();
+ user.setUserName("reader");
+ user.setPassword("x");
+ user.setEnabled(enabled);
+ when(users.getUserByOpenIdUrl(OPENID)).thenReturn(user);
+ when(users.getRoles(user)).thenReturn(List.of("editor"));
+ return user;
+ }
+
+ @Test
+ void enabledOpenIdUserSignsIn() throws Exception {
+ user(true);
+ UserDetails details = new
RollerUserDetailsService().loadUserByUsername(OPENID);
+ assertEquals("reader", details.getUsername());
+ }
+
+ @Test
+ void disabledOpenIdUserIsRefused() throws Exception {
Review Comment:
A few more cases would help:
- An unknown OpenID URL still returns the `rollerOpenidLogin` placeholder,
so registration keeps working and the new check sits in the right place.
- A null `enabled` is refused.
- A URL with a trailing slash is refused for a disabled user.
--
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]
