Skip to content

Commit ffa4619

Browse files
authored
Merge pull request #11763 from IQSS/11689-builtin-users-api-auth-enhance
Enhance Builtin users SPI security
2 parents 2e65650 + cc6bd1c commit ffa4619

File tree

9 files changed

+2480
-58
lines changed

9 files changed

+2480
-58
lines changed

conf/keycloak/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ COPY --from=builder /app/target/keycloak-dv-builtin-users-authenticator-1.0-SNAP
2929

3030
# Copy additional configurations
3131
COPY ./builtin-users-spi/conf/quarkus.properties /opt/keycloak/conf/
32-
COPY ./test-realm.json /opt/keycloak/data/import/
32+
COPY ./test-realm-include-spi.json /opt/keycloak/data/import/
3333

3434
# Set the Keycloak command
3535
ENTRYPOINT ["/opt/keycloak/bin/kc.sh"]

conf/keycloak/builtin-users-spi/src/main/java/edu/harvard/iq/keycloak/auth/spi/adapters/DataverseUserAdapter.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package edu.harvard.iq.keycloak.auth.spi.adapters;
22

33
import edu.harvard.iq.keycloak.auth.spi.models.DataverseUser;
4+
import edu.harvard.iq.keycloak.auth.spi.providers.DataverseUserStorageProviderFactory;
45
import org.keycloak.component.ComponentModel;
56
import org.keycloak.models.GroupModel;
67
import org.keycloak.models.KeycloakSession;
@@ -15,10 +16,13 @@ public class DataverseUserAdapter extends AbstractUserAdapterFederatedStorage {
1516
protected DataverseUser dataverseUser;
1617
protected String keycloakId;
1718

19+
private static final String ATTRIBUTE_NAME_IDP = "idp";
20+
1821
public DataverseUserAdapter(KeycloakSession session, RealmModel realm, ComponentModel model, DataverseUser dataverseUser) {
1922
super(session, realm, model);
2023
this.dataverseUser = dataverseUser;
2124
keycloakId = StorageId.keycloakId(model, dataverseUser.getBuiltinUser().getId().toString());
25+
this.setSingleAttribute(ATTRIBUTE_NAME_IDP, DataverseUserStorageProviderFactory.PROVIDER_ID);
2226
}
2327

2428
@Override

0 commit comments

Comments
 (0)