From 90a2d1801f1e795e071d8928d59ac8b8fac1d2fd Mon Sep 17 00:00:00 2001 From: Michael Hirsch Date: Tue, 20 Sep 2016 10:33:01 +0200 Subject: [PATCH 1/3] use security-props for retrieving spring user configuration Signed-off-by: Michael Hirsch --- .../security/InMemoryUserManagementConfiguration.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/InMemoryUserManagementConfiguration.java b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/InMemoryUserManagementConfiguration.java index fc979fd67..15a9c5bcc 100644 --- a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/InMemoryUserManagementConfiguration.java +++ b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/InMemoryUserManagementConfiguration.java @@ -13,7 +13,9 @@ import java.util.ArrayList; import org.eclipse.hawkbit.im.authentication.MultitenancyIndicator; import org.eclipse.hawkbit.im.authentication.PermissionUtils; import org.eclipse.hawkbit.im.authentication.TenantAwareAuthenticationDetails; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.boot.autoconfigure.security.SecurityProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; @@ -34,6 +36,9 @@ import org.springframework.security.provisioning.InMemoryUserDetailsManager; @ConditionalOnMissingBean(UserDetailsService.class) public class InMemoryUserManagementConfiguration extends GlobalAuthenticationConfigurerAdapter { + @Autowired + private SecurityProperties securityProperties; + @Override public void configure(final AuthenticationManagerBuilder auth) throws Exception { final DaoAuthenticationProvider userDaoAuthenticationProvider = new TenantDaoAuthenticationProvider(); @@ -49,7 +54,8 @@ public class InMemoryUserManagementConfiguration extends GlobalAuthenticationCon public UserDetailsService userDetailsService() { final InMemoryUserDetailsManager inMemoryUserDetailsManager = new InMemoryUserDetailsManager(new ArrayList<>()); inMemoryUserDetailsManager.setAuthenticationManager(null); - inMemoryUserDetailsManager.createUser(new User("admin", "admin", PermissionUtils.createAllAuthorityList())); + inMemoryUserDetailsManager.createUser(new User(securityProperties.getUser().getName(), + securityProperties.getUser().getPassword(), PermissionUtils.createAllAuthorityList())); return inMemoryUserDetailsManager; } From 0cee24320b075e95ae96fa5f11cb5ea7e0e394fa Mon Sep 17 00:00:00 2001 From: Michael Hirsch Date: Tue, 20 Sep 2016 10:36:03 +0200 Subject: [PATCH 2/3] add admin user to example app Signed-off-by: Michael Hirsch --- .../src/main/resources/application.properties | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/examples/hawkbit-example-app/src/main/resources/application.properties b/examples/hawkbit-example-app/src/main/resources/application.properties index 6e05b6b5a..1a94206bb 100644 --- a/examples/hawkbit-example-app/src/main/resources/application.properties +++ b/examples/hawkbit-example-app/src/main/resources/application.properties @@ -7,6 +7,10 @@ # http://www.eclipse.org/legal/epl-v10.html # +# User Security +security.user.name=admin +security.user.password=admin + # DDI authentication configuration hawkbit.server.ddi.security.authentication.anonymous.enabled=true hawkbit.server.ddi.security.authentication.targettoken.enabled=true From 0a604d4c400d4ba6ca3ba00e79a7902bcdd4999e Mon Sep 17 00:00:00 2001 From: Michael Hirsch Date: Wed, 21 Sep 2016 10:05:33 +0200 Subject: [PATCH 3/3] set default admin admin in hawkBit defaults Signed-off-by: Michael Hirsch --- .../src/main/resources/hawkbitdefaults.properties | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hawkbit-autoconfigure/src/main/resources/hawkbitdefaults.properties b/hawkbit-autoconfigure/src/main/resources/hawkbitdefaults.properties index cb7793168..f1e8c0a21 100644 --- a/hawkbit-autoconfigure/src/main/resources/hawkbitdefaults.properties +++ b/hawkbit-autoconfigure/src/main/resources/hawkbitdefaults.properties @@ -10,6 +10,10 @@ # Displayed basic auth realm security.basic.realm=HawkBit +# User Security +security.user.name=admin +security.user.password=admin + # JPA / Datasource spring.jpa.eclipselink.eclipselink.weaving=false spring.jpa.database=H2