From 6d26b86792d85d4ab048e5a1a8282d6b66e0de3e Mon Sep 17 00:00:00 2001
From: Rob Winch <rwinch@users.noreply.github.com>
Date: Fri, 22 Sep 2017 20:11:15 -0500
Subject: [PATCH] Add UserDetailsRepositoryResourceFactoryBean.fromString

Fixes gh-4566
---
 ...rDetailsRepositoryResourceFactoryBean.java | 14 +++++
 ...sitoryResourceFactoryBeanStringITests.java | 52 +++++++++++++++++++
 2 files changed, 66 insertions(+)
 create mode 100644 config/src/test/java/org/springframework/security/config/core/userdetails/UserDetailsRepositoryResourceFactoryBeanStringITests.java

diff --git a/config/src/main/java/org/springframework/security/config/core/userdetails/UserDetailsRepositoryResourceFactoryBean.java b/config/src/main/java/org/springframework/security/config/core/userdetails/UserDetailsRepositoryResourceFactoryBean.java
index e830091887..02dc04a25d 100644
--- a/config/src/main/java/org/springframework/security/config/core/userdetails/UserDetailsRepositoryResourceFactoryBean.java
+++ b/config/src/main/java/org/springframework/security/config/core/userdetails/UserDetailsRepositoryResourceFactoryBean.java
@@ -22,6 +22,7 @@ import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.security.core.userdetails.MapUserDetailsRepository;
 import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.util.InMemoryResource;
 
 import java.util.Collection;
 
@@ -95,4 +96,17 @@ public class UserDetailsRepositoryResourceFactoryBean implements ResourceLoaderA
 		result.setResource(propertiesResource);
 		return result;
 	}
+
+	/**
+	 * Create a UserDetailsRepositoryResourceFactoryBean with a String that is in the
+	 * format defined in {@link UserDetailsResourceFactoryBean}
+	 *
+	 * @param users the users in the format defined in {@link UserDetailsResourceFactoryBean}
+	 * @return the UserDetailsResourceFactoryBean
+	 */
+	public static UserDetailsRepositoryResourceFactoryBean fromString(String users) {
+		UserDetailsRepositoryResourceFactoryBean result = new UserDetailsRepositoryResourceFactoryBean();
+		result.setResource(new InMemoryResource(users));
+		return result;
+	}
 }
diff --git a/config/src/test/java/org/springframework/security/config/core/userdetails/UserDetailsRepositoryResourceFactoryBeanStringITests.java b/config/src/test/java/org/springframework/security/config/core/userdetails/UserDetailsRepositoryResourceFactoryBeanStringITests.java
new file mode 100644
index 0000000000..0da84bfc24
--- /dev/null
+++ b/config/src/test/java/org/springframework/security/config/core/userdetails/UserDetailsRepositoryResourceFactoryBeanStringITests.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2002-2017 the original author or authors.
+ *
+ * Licensed 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.springframework.security.config.core.userdetails;
+
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.core.userdetails.UserDetailsRepository;
+import org.springframework.security.util.InMemoryResource;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
+
+/**
+ * @author Rob Winch
+ * @since 5.0
+ */
+@RunWith(SpringRunner.class)
+public class UserDetailsRepositoryResourceFactoryBeanStringITests {
+	@Autowired
+	UserDetailsRepository users;
+
+	@Test
+	public void loadUserByUsernameWhenUserFoundThenNotNull() {
+		assertThat(users.findByUsername("user").block()).isNotNull();
+	}
+
+	@Configuration
+	static class Config {
+		@Bean
+		public UserDetailsRepositoryResourceFactoryBean userDetailsService() {
+			return UserDetailsRepositoryResourceFactoryBean.fromString("user=password,ROLE_USER");
+		}
+	}
+}