0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

OIDC support groups (#2679)

Browse source
This commit is contained in:
jasongwq 2022-09-03 09:01:26 +08:00 • committed by GitHub
parent 63da35d257
commit 33c67b3a2b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/main/java/org/codelibs/fess/app/web/base/login/OpenIdConnectCredential.java
View file

@ -18,10 +18,11 @@ package org.codelibs.fess.app.web.base.login;
import static org.codelibs.core.stream.StreamUtil.split;
import static org.codelibs.core.stream.StreamUtil.stream;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.*;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.fess.entity.FessUser;
import org.codelibs.fess.helper.SystemHelper;
@ -46,8 +47,16 @@ public class OpenIdConnectCredential implements LoginCredential, FessCredential
return (String) attributes.get("email");
}
public String[] getUserGroups() {
String[] userGroups = (String[]) attributes.get("groups");
if (userGroups == null) {
userGroups = getDefaultGroupsAsArray();
}
return (userGroups);
}
public OpenIdUser getUser() {
return new OpenIdUser(getUserId(), getDefaultGroupsAsArray(), getDefaultRolesAsArray());
return new OpenIdUser(getUserId(), getUserGroups(), getDefaultRolesAsArray());
}
protected static String[] getDefaultGroupsAsArray() {

13
src/main/java/org/codelibs/fess/sso/oic/OpenIdConnectAuthenticator.java
View file

@ -16,9 +16,7 @@
package org.codelibs.fess.sso.oic;
import java.io.IOException;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import java.util.*;
import javax.annotation.PostConstruct;
import javax.servlet.http.HttpServletRequest;
@ -198,6 +196,15 @@ public class OpenIdConnectAuthenticator implements SsoAuthenticator {
case "exp":
attributes.put("exp", jsonParser.getText());
break;
case "groups":
List<String> list = new ArrayList<String>();
while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
final String group = jsonParser.getText();
list.add(group);
logger.debug(group);
}
attributes.put("groups", list.toArray(new String[list.size()]));
break;
}
}
}