added property shiny.proxy.authentication (value: ldap or none)

openanalytics · Jun 7, 2016 · 5149e7e · 5149e7e
1 parent a1612d6
commit 5149e7e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/main/java/eu/openanalytics/WebSecurityConfig.java b/src/main/java/eu/openanalytics/WebSecurityConfig.java
@@ -78,7 +78,7 @@ protected void configure(HttpSecurity http) throws Exception {
 				.frameOptions()
 					.sameOrigin();
 
-		if (environment.getProperty("shiny.proxy.ldap.url") != null) {
+		if (hasAuth(environment)) {
 			http.authorizeRequests().antMatchers("/login").permitAll();
 			for (ShinyApp app: appService.getApps()) {
 				http.authorizeRequests().antMatchers("/app/" + app.getName()).hasAnyRole(appService.getAppRoles(app.getName()));
@@ -96,6 +96,11 @@ protected void configure(HttpSecurity http) throws Exception {
 		}
 	}
 
+	private static boolean hasAuth(Environment env) {
+		String auth = env.getProperty("shiny.proxy.authentication", "").toLowerCase();
+		return (!auth.isEmpty() && !auth.equals("none"));
+	}
+
 	@Configuration
 	protected static class AuthenticationConfiguration extends GlobalAuthenticationConfigurerAdapter {
 
@@ -104,8 +109,7 @@ protected static class AuthenticationConfiguration extends GlobalAuthenticationC
 
 		@Override
 		public void init(AuthenticationManagerBuilder auth) throws Exception {
-			String ldapUrl = environment.getProperty("shiny.proxy.ldap.url");
-			if (ldapUrl == null) return;
+			if (!hasAuth(environment)) return;
 
 			String[] userDnPatterns = { environment.getProperty("shiny.proxy.ldap.user-dn-pattern") };
 			if (userDnPatterns[0] == null || userDnPatterns[0].isEmpty()) userDnPatterns = new String[0];
@@ -114,6 +118,7 @@ public void init(AuthenticationManagerBuilder auth) throws Exception {
 			if (managerDn != null && managerDn.isEmpty()) managerDn = null;
 
 			// Manually instantiate contextSource so it can be passed into authoritiesPopulator below.
+			String ldapUrl = environment.getProperty("shiny.proxy.ldap.url");
 			DefaultSpringSecurityContextSource contextSource = new DefaultSpringSecurityContextSource(ldapUrl);
 			if (managerDn != null) {
 				contextSource.setUserDn(managerDn);

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -4,6 +4,7 @@ shiny:
     logo-url: http://www.openanalytics.eu/sites/www.openanalytics.eu/themes/oa/logo.png
     landing-page: /
     port: 8080
+    authentication: ldap
     # LDAP configuration
     ldap:
       url: ldap://ldap.forumsys.com:389/dc=example,dc=com