Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

made Organisation optional so it uses version 2 if it does not have one #169

Merged
merged 1 commit into from
Feb 20, 2024
Merged

made Organisation optional so it uses version 2 if it does not have one #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions client/src/main/java/dk/acto/fafnir/api/service/AdministrationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
import dk.acto.fafnir.api.model.*;
import reactor.core.publisher.ConnectableFlux;

import java.util.Optional;


public interface AdministrationService {
/**
Expand Down Expand Up @@ -99,6 +101,10 @@ public interface AdministrationService {
*/
OrganisationData readOrganisation(TenantIdentifier identifier);



Optional<OrganisationData> readOrganisationDoesNotThrow(TenantIdentifier identifier);

/**
* Updates an organisation. Fails if organisation does not exist.
*
Expand Down
9 changes: 9 additions & 0 deletions ...nt/src/main/java/dk/acto/fafnir/api/service/hazelcast/HazelcastAdministrationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,15 @@ public OrganisationData readOrganisation(TenantIdentifier identifier) {
.findAny()
.orElseThrow(NoSuchOrganisation::new);
}
@Override
public Optional<OrganisationData> readOrganisationDoesNotThrow(TenantIdentifier identifier) {
IMap<String, OrganisationData> orgMap = hazelcastInstance.getMap(hazelcastConf.getPrefix() + ORG_POSTFIX);
return orgMap.values()
.stream()
.filter(entry -> identifier.matches(entry.getProviderConfiguration()))
.findAny();
}


@Override
public OrganisationData updateOrganisation(OrganisationData source) {
Expand Down
39 changes: 26 additions & 13 deletions sso/src/main/java/dk/acto/fafnir/sso/provider/GoogleProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ public String authenticate() {
@Override
public AuthenticationResult callback(TokenCredentials data) {
var token = Try.of(() -> googleOauth.getAccessToken(data.getCode()))
.onFailure(x -> log.error("Authentication failed", x))
.getOrNull();
.onFailure(x -> log.error("Authentication failed", x))
.getOrNull();
if (token == null) {
return AuthenticationResult.failure(FailureReason.AUTHENTICATION_FAILED);
}
Expand All @@ -42,22 +42,35 @@ public AuthenticationResult callback(TokenCredentials data) {
var subject = jwtToken.getClaims().get("email").asString();
var displayName = jwtToken.getClaims().get("name").asString();
var providerValue = Optional.ofNullable(jwtToken.getClaim("hd"))
.map(Claim::asString)
.orElse("");
.map(Claim::asString)
.orElse("");

var subjectActual = UserData.builder()
.subject(providerConf.applySubjectRules(subject))
.name(displayName)
.build();
var orgActual = administrationService.readOrganisation(
test -> getMetaData().getProviderId().equals(test.getProviderId()) &&
(providerValue.equals(test.getValues().get("Organisation Domain")) || "true".equals(test.getValues().get("Catchall Organisation")))
.subject(providerConf.applySubjectRules(subject))
.name(displayName)
.build();

var orgOptional = administrationService.readOrganisationDoesNotThrow(
test -> getMetaData().getProviderId().equals(test.getProviderId()) &&
(providerValue.equals(test.getValues().get("Organisation Domain")) || "true".equals(test.getValues().get("Catchall Organisation")))
);
var claimsActual = ClaimData.empty();

var jwt = tokenFactory.generateToken(subjectActual, orgActual, claimsActual, getMetaData(), providerValue);
if (orgOptional.isPresent()) {
var orgActual = orgOptional.get();
var claimsActual = ClaimData.empty();
var jwt = tokenFactory.generateToken(subjectActual, orgActual, claimsActual, getMetaData(), providerValue);
return AuthenticationResult.success(jwt);
} else {
var fafnirUser = FafnirUser.builder()
.data(subjectActual)
.organisationId(providerValue)
.organisationName(displayName)
.provider("google")
.build();

return AuthenticationResult.success(jwt);
var jwt = tokenFactory.generateToken(fafnirUser);
return AuthenticationResult.success(jwt);
}
}

@Override
Expand Down
45 changes: 41 additions & 4 deletions sso/src/main/java/dk/acto/fafnir/sso/util/TokenFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@
import com.auth0.jwt.algorithms.Algorithm;
import dk.acto.fafnir.api.crypto.RsaKeyManager;
import dk.acto.fafnir.api.exception.*;
import dk.acto.fafnir.api.model.ClaimData;
import dk.acto.fafnir.api.model.OrganisationData;
import dk.acto.fafnir.api.model.ProviderMetaData;
import dk.acto.fafnir.api.model.UserData;
import dk.acto.fafnir.api.model.*;
import io.vavr.control.Try;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Component;
Expand Down Expand Up @@ -70,6 +67,46 @@ public String generateToken(final UserData ud, OrganisationData od, ClaimData cd
.get();
}

public String generateToken (final FafnirUser fafnirUser) {
var jwt = JWT.create();

var temp = Optional.ofNullable(fafnirUser)
.orElseThrow(NoUser::new);

jwt.withIssuer(Optional.ofNullable(temp.getProvider())
.map(idp -> "fafnir-" + idp)
.orElseThrow(NoIssuer::new));

jwt.withSubject(Optional.ofNullable(temp.getSubject())
.orElseThrow(NoSubject::new));

jwt.withIssuedAt(Date.from(Instant.now()));

Optional.ofNullable(temp.getName())
.ifPresent(name -> jwt.withClaim("name", name));

Optional.ofNullable(temp.getMetaId())
.ifPresent(name -> jwt.withClaim("mId", name));

Optional.ofNullable(temp.getLocale())
.ifPresent(locale -> jwt.withClaim("locale", locale.toLanguageTag()));

Optional.ofNullable(temp.getOrganisationId())
.ifPresent(orgId -> jwt.withClaim("org_id", orgId));

Optional.ofNullable(temp.getOrganisationName())
.ifPresent(orgName -> jwt.withClaim("org_name", orgName));

Optional.ofNullable(temp.getRoles())
.filter(x -> x.length > 0)
.ifPresent(roles -> jwt.withArrayClaim("role", roles));


return Try.of(() -> Algorithm.RSA512(keyManager.getPublicKey(), keyManager.getPrivateKey()))
.map(jwt::sign)
.get();
}

public String generateToken(final UserData ud, OrganisationData od, ClaimData cd, ProviderMetaData pmd) {
return generateToken(ud, od, cd, pmd, null);
}
Expand Down
Loading