Makes User implement UserDetails to work with Spring Security (#37)

spinnaker · May 3, 2016 · 08dfbb0 · 08dfbb0
1 parent 4a1e8cc
commit 08dfbb0
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/kork-security/kork-security.gradle b/kork-security/kork-security.gradle
@@ -2,6 +2,7 @@ dependencies {
   compile spinnaker.dependency('springSecurityCore')
   compile spinnaker.dependency('groovy')
   spinnaker.group('spockBase')
+  spinnaker.group('jackson')
 
   compile spinnaker.dependency('slf4j')
   testCompile 'ch.qos.logback:logback-classic:1.1.2'

diff --git a/kork-security/src/main/groovy/com/netflix/spinnaker/security/User.groovy b/kork-security/src/main/groovy/com/netflix/spinnaker/security/User.groovy
@@ -16,10 +16,16 @@
 
 package com.netflix.spinnaker.security
 
+import com.fasterxml.jackson.annotation.JsonIgnore
 import groovy.transform.Immutable
+import org.springframework.security.core.authority.SimpleGrantedAuthority
+import org.springframework.security.core.userdetails.UserDetails
 
+/**
+ * User implements UserDetails in order to properly hook into the Spring Security framework.
+ */
 @Immutable
-class User implements Serializable {
+class User implements Serializable, UserDetails {
   static final long serialVersionUID = 7392392099262597885L
 
   String email
@@ -28,4 +34,25 @@ class User implements Serializable {
 
   Collection<String> roles
   Collection<String> allowedAccounts = []
+
+  @Override
+  List getAuthorities() {
+    roles?.collect { new SimpleGrantedAuthority(it) }
+  }
+
+  /** Not used **/
+  String username
+  @JsonIgnore String password
+
+  @Override
+  boolean isAccountNonExpired() { return true }
+
+  @Override
+  boolean isAccountNonLocked() { return true }
+
+  @Override
+  boolean isCredentialsNonExpired() { return true }
+
+  @Override
+  boolean isEnabled() { return true }
 }