Skip to content

Commit 173a05d

Browse files
authored
bugfix OpenIdConnectAuthenticator (#2847)
Fixed an issue where the type of `attributes["groups"]` had changed from `String[]` to `List<Object>`. Add unittest.
1 parent 28bd300 commit 173a05d

File tree

2 files changed

+51
-0
lines changed

2 files changed

+51
-0
lines changed

src/main/java/org/codelibs/fess/sso/oic/OpenIdConnectAuthenticator.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,11 @@ private Object parseArray(JsonParser jsonParser) throws IOException {
216216
list.add(parsePrimitive(jsonParser));
217217
}
218218
}
219+
220+
if (list.stream().allMatch(String.class::isInstance)) {
221+
return list.toArray(new String[list.size()]);
222+
}
223+
219224
return list;
220225
}
221226

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
/*
2+
* Copyright 2012-2024 CodeLibs Project and the Others.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
13+
* either express or implied. See the License for the specific language
14+
* governing permissions and limitations under the License.
15+
*/
16+
package org.codelibs.fess.sso.oic;
17+
18+
import static org.junit.Assert.assertArrayEquals;
19+
20+
import java.io.IOException;
21+
import java.util.HashMap;
22+
import java.util.Map;
23+
24+
import org.codelibs.fess.unit.UnitFessTestCase;
25+
26+
public class OpenIdConnectAuthenticatorTest extends UnitFessTestCase {
27+
public void test_parseJwtClaim() throws IOException {
28+
// Setup
29+
OpenIdConnectAuthenticator authenticator = new OpenIdConnectAuthenticator();
30+
final Map<String, Object> attributes = new HashMap<>();
31+
String jwtClaim = "{\"sub\":\"1234567890\",\"name\":\"John Doe\",\"groups\":[\"group1\",\"group2\"]}";
32+
33+
// Execute
34+
authenticator.parseJwtClaim(jwtClaim, attributes);
35+
36+
// Verify
37+
assertEquals("1234567890", attributes.get("sub"));
38+
assertEquals("John Doe", attributes.get("name"));
39+
40+
// Check groups array
41+
assertTrue(attributes.get("groups") instanceof String[]);
42+
String[] groupArray = (String[]) attributes.get("groups");
43+
assertArrayEquals(new String[] { "group1", "group2" }, groupArray);
44+
45+
}
46+
}

0 commit comments

Comments
 (0)