Skip to content
This repository was archived by the owner on Jul 30, 2020. It is now read-only.

Commit 2f48b22

Browse files
amarinsoamarinso
authored
Merge pull request #60 from pablo-parra/new-winauth
New winauth modules
2 parents 3defc3a + 8515d77 commit 2f48b22

42 files changed

Lines changed: 713 additions & 141 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎modules/pom.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616
<modules>
1717
<module>foo</module>
1818
<module>reporting</module>
19-
<module>i18n</module>
20-
<module>winauth</module>
19+
<module>i18n</module>
20+
<module>winauth-ad</module>
21+
<module>winauth-sso</module>
2122
<module>async</module>
2223
</modules>
2324

modules/winauth/pom.xml renamed to modules/winauth-ad/pom.xml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,12 @@
77
<version>dev-SNAPSHOT</version>
88
</parent>
99
<groupId>com.capgemini.devonfw.modules</groupId>
10-
<artifactId>devonfw-winauth</artifactId>
10+
<artifactId>devonfw-winauth-ad</artifactId>
1111
<version>${devonfw.version}</version>
1212
<name>${project.artifactId}</name>
1313
<description>Active Directory base authentication.</description>
1414

1515
<dependencies>
16-
<!-- Waffle dependency -->
17-
<dependency>
18-
<groupId>com.github.dblock.waffle</groupId>
19-
<artifactId>waffle-spring-security3</artifactId>
20-
</dependency>
21-
<!-- END Waffle dependency -->
2216

2317
<dependency>
2418
<groupId>javax.servlet</groupId>

modules/winauth/src/main/java/com/capgemini/devonfw/module/winauth/common/api/AuthenticationManagerAD.java renamed to modules/winauth-ad/src/main/java/com/capgemini/devonfw/module/winauthad/common/api/AuthenticationManagerAD.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.capgemini.devonfw.module.winauth.common.api;
1+
package com.capgemini.devonfw.module.winauthad.common.api;
22

33
import org.springframework.security.ldap.authentication.LdapAuthenticationProvider;
44

modules/winauth/src/main/java/com/capgemini/devonfw/module/winauth/common/api/AuthenticationSource.java renamed to modules/winauth-ad/src/main/java/com/capgemini/devonfw/module/winauthad/common/api/AuthenticationSource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.capgemini.devonfw.module.winauth.common.api;
1+
package com.capgemini.devonfw.module.winauthad.common.api;
22

33
import javax.naming.directory.Attributes;
44

modules/winauth/src/main/java/com/capgemini/devonfw/module/winauth/common/api/PrincipalProfile.java renamed to modules/winauth-ad/src/main/java/com/capgemini/devonfw/module/winauthad/common/api/PrincipalProfile.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.capgemini.devonfw.module.winauth.common.api;
1+
package com.capgemini.devonfw.module.winauthad.common.api;
22

33
import java.security.Principal;
44
import java.util.List;

modules/winauth/src/main/java/com/capgemini/devonfw/module/winauth/common/api/UserData.java renamed to modules/winauth-ad/src/main/java/com/capgemini/devonfw/module/winauthad/common/api/UserData.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.capgemini.devonfw.module.winauth.common.api;
1+
package com.capgemini.devonfw.module.winauthad.common.api;
22

33
import java.security.Principal;
44
import java.util.Collection;
@@ -8,7 +8,7 @@
88
import org.springframework.security.core.context.SecurityContextHolder;
99
import org.springframework.security.core.userdetails.User;
1010

11-
import com.capgemini.devonfw.module.winauth.common.api.to.UserDetailsClientToAD;
11+
import com.capgemini.devonfw.module.winauthad.common.api.to.UserDetailsClientToAD;
1212

1313
/**
1414
* Container class for the profile of a user.

modules/winauth/src/main/java/com/capgemini/devonfw/module/winauth/common/api/Usermanagement.java renamed to modules/winauth-ad/src/main/java/com/capgemini/devonfw/module/winauthad/common/api/Usermanagement.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.capgemini.devonfw.module.winauth.common.api;
1+
package com.capgemini.devonfw.module.winauthad.common.api;
22

33
/**
44
* Interface to get a user from its login.

modules/winauth/src/main/java/com/capgemini/devonfw/module/winauth/common/api/accesscontrol/ActiveDirectory.java renamed to modules/winauth-ad/src/main/java/com/capgemini/devonfw/module/winauthad/common/api/accesscontrol/ActiveDirectory.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.capgemini.devonfw.module.winauth.common.api.accesscontrol;
1+
package com.capgemini.devonfw.module.winauthad.common.api.accesscontrol;
22

33
import java.util.Properties;
44

@@ -174,10 +174,7 @@ private String getFilter(String searchValue, String searchBy) {
174174

175175
String filter = this.baseFilter;
176176
filter += "(" + searchBy + "=" + searchValue + "))";
177-
/*
178-
* if (searchBy.equals("email")) { filter += "(mail=" + searchValue + "))"; } else if (searchBy.equals("username"))
179-
* { filter += "(samaccountname=" + searchValue + "))"; }
180-
*/
177+
181178
return filter;
182179
}
183180

modules/winauth/src/main/java/com/capgemini/devonfw/module/winauth/common/api/security/UserDataAD.java renamed to modules/winauth-ad/src/main/java/com/capgemini/devonfw/module/winauthad/common/api/security/UserDataAD.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.capgemini.devonfw.module.winauth.common.api.security;
1+
package com.capgemini.devonfw.module.winauthad.common.api.security;
22

33
import java.security.Principal;
44
import java.util.Collection;
@@ -8,8 +8,8 @@
88
import org.springframework.security.core.context.SecurityContextHolder;
99
import org.springframework.security.core.userdetails.User;
1010

11-
import com.capgemini.devonfw.module.winauth.common.api.PrincipalProfile;
12-
import com.capgemini.devonfw.module.winauth.common.api.to.UserDetailsClientToAD;
11+
import com.capgemini.devonfw.module.winauthad.common.api.PrincipalProfile;
12+
import com.capgemini.devonfw.module.winauthad.common.api.to.UserDetailsClientToAD;
1313

1414
/**
1515
* Container class for the profile of a user.

modules/winauth/src/main/java/com/capgemini/devonfw/module/winauth/common/api/to/UserDetailsClientToAD.java renamed to modules/winauth-ad/src/main/java/com/capgemini/devonfw/module/winauthad/common/api/to/UserDetailsClientToAD.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package com.capgemini.devonfw.module.winauth.common.api.to;
1+
package com.capgemini.devonfw.module.winauthad.common.api.to;
22

33
import java.util.List;
44

5-
import com.capgemini.devonfw.module.winauth.common.api.PrincipalProfile;
5+
import com.capgemini.devonfw.module.winauthad.common.api.PrincipalProfile;
66

77
import io.oasp.module.basic.common.api.to.AbstractTo;
88

0 commit comments

Comments
 (0)