Skip to content

Commit

Permalink
config refactor, PR changes
Browse files Browse the repository at this point in the history 
Signed-off-by: Maciej Mierzwa <dev.maciej.mierzwa@gmail.com>
  • Loading branch information
@MaciejMierzwa
MaciejMierzwa committed Jun 23, 2023
1 parent c335f08 commit cf8d2c9
Show file tree
Hide file tree
Showing 5 changed files with 87 additions and 363 deletions.
3 changes: 2 additions & 1 deletion src/main/java/org/opensearch/security/authtoken/jwt/JwtVendor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import java.util.Base64;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
Expand Down Expand Up @@ -124,7 +125,7 @@ static JsonWebKey createJwkFromSettings(Settings settings) {
Settings jwkSettings = settings.getAsSettings("jwt").getAsSettings("key");

if (algorithm != null) {
return getSigningJwk(algorithm.toUpperCase(), settings);
return getSigningJwk(algorithm.toUpperCase(Locale.ROOT), settings);
} else if(!jwkSettings.isEmpty()) {
JsonWebKey jwk = new JsonWebKey();

Expand Down
71 changes: 71 additions & 0 deletions src/main/java/org/opensearch/security/securityconf/impl/OnBehalfOf.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
/*
* SPDX-License-Identifier: Apache-2.0
*
* The OpenSearch Contributors require contributions made to
* this file be licensed under the Apache-2.0 license or a
* compatible open source license.
*/

package org.opensearch.security.securityconf.impl;

import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.core.JsonProcessingException;

import org.opensearch.security.DefaultObjectMapper;

public class OnBehalfOf {
@JsonProperty("encryption_key")
public String encryptionKey;
@JsonProperty
public String algorithm;
//HMAC
@JsonProperty("signing_key")
public String signingKey;
//EC
@JsonProperty("ec_private_key")
public String ecPrivateKey;
@JsonProperty("ec_private")
public String ecPrivate;
@JsonProperty("ec_x")
public String ecXCoordinate;
@JsonProperty("ec_y")
public String ecYCoordinate;
//RSA
@JsonProperty("rsa_private_key")
public String rsaPrivateKey;
@JsonProperty("rsa_modulus")
public String rsaModulus;
@JsonProperty("rsa_public_exp")
public String rsaPublicExp;
@JsonProperty("rsa_private_exp")
public String rsaPrivateExp;
@JsonProperty("rsa_first_prime_factor")
public String rsaFirstPrimeFactor;
@JsonProperty("rsa_second_prime_factor")
public String rsaSecondPrimeFactor;
@JsonProperty("rsa_first_prime_crt")
public String rsaFirstPrimeCrt;
@JsonProperty("rsa_second_prime_crt")
public String rsaSecondPrimeCrt;
@JsonProperty("rsa_first_crt_coefficient")
public String rsaFirstCrtCoefficient;

@JsonIgnore
public String configAsJson() {
try {
return DefaultObjectMapper.writeValueAsString(this, false);
} catch (JsonProcessingException e) {
throw new RuntimeException(e);
}
}

@Override
public String toString() {
return "OnBehalfOf [signing_key=" + signingKey + ", encryption_key=" + encryptionKey + ", algorithm=" + algorithm +
", signing_key=" + signingKey + ", ec_private_key=" + ecPrivateKey + ", ec_private=" + ecPrivate + ", ec_x=" + ecXCoordinate + ", ec_y=" + ecYCoordinate + ", rsa_private_key=" + rsaPrivateKey +
", rsa_modulus=" + rsaModulus + ", rsa_public_exp=" + rsaPublicExp + ", rsa_private_exp=" + rsaPrivateExp +
", rsa_first_prime_factor=" + rsaFirstPrimeFactor + ", rsa_second_prime_factor=" + rsaSecondPrimeFactor +
", rsa_first_prime_crt=" + rsaFirstPrimeCrt + ", rsa_second_prime_crt=" + rsaSecondPrimeCrt + ", rsa_first_crt_coefficient=" + rsaFirstCrtCoefficient + "]";
}
}
178 changes: 1 addition & 177 deletions src/main/java/org/opensearch/security/securityconf/impl/v6/ConfigV6.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.core.JsonProcessingException;

import org.opensearch.security.DefaultObjectMapper;
import org.opensearch.security.auth.internal.InternalAuthenticationBackend;
import org.opensearch.security.securityconf.impl.OnBehalfOf;

public class ConfigV6 {

Expand Down Expand Up @@ -324,180 +324,4 @@ public String toString() {

}

public static class OnBehalfOf {
@JsonProperty("encryption_key")
private String encryptionKey;
@JsonProperty
private String algorithm;
//HMAC
@JsonProperty("signing_key")
private String signingKey;
//EC
@JsonProperty("ec_private_key")
private String ecPrivateKey;
@JsonProperty("ec_private")
private String ecPrivate;
@JsonProperty("ec_x")
private String ecXCoordinate;
@JsonProperty("ec_y")
private String ecYCoordinate;
//RSA
@JsonProperty("rsa_private_key")
private String rsaPrivateKey;

@JsonProperty("rsa_modulus")
private String rsaModulus;

@JsonProperty("rsa_public_exp")
private String rsaPublicExp;
@JsonProperty("rsa_private_exp")
private String rsaPrivateExp;
@JsonProperty("rsa_first_prime_factor")
private String rsaFirstPrimeFactor;
@JsonProperty("rsa_second_prime_factor")
private String rsaSecondPrimeFactor;
@JsonProperty("rsa_first_prime_crt")
private String rsaFirstPrimeCrt;
@JsonProperty("rsa_second_prime_crt")
private String rsaSecondPrimeCrt;
@JsonProperty("rsa_first_crt_coefficient")
private String rsaFirstCrtCoefficient;
public String getSigningKey() {
return signingKey;
}

public void setSigningKey(String signingKey) {
this.signingKey = signingKey;
}

public String getEncryptionKey() {
return encryptionKey;
}

public void setEncryptionKey(String encryptionKey) {
this.encryptionKey = encryptionKey;
}

public String getAlgorithm() {
return algorithm;
}

public void setAlgorithm(String algorithm) {
this.algorithm = algorithm;
}

public String getEcPrivateKey() {
return ecPrivateKey;
}

public void setEcPrivateKey(String ecPrivateKey) {
this.ecPrivateKey = ecPrivateKey;
}

public String getEcPrivate() {
return ecPrivate;
}

public void setEcPrivate(String ecPrivate) {
this.ecPrivate = ecPrivate;
}

public String getEcXCoordinate() {
return ecXCoordinate;
}

public void setEcXCoordinate(String ecXCoordinate) {
this.ecXCoordinate = ecXCoordinate;
}

public String getEcYCoordinate() {
return ecYCoordinate;
}

public void setEcYCoordinate(String ecYCoordinate) {
this.ecYCoordinate = ecYCoordinate;
}

public String getRsaPrivateKey() {
return rsaPrivateKey;
}

public void setRsaPrivateKey(String rsaPrivateKey) {
this.rsaPrivateKey = rsaPrivateKey;
}

public String getRsaModulus() {
return rsaModulus;
}

public void setRsaModulus(String rsaModulus) {
this.rsaModulus = rsaModulus;
}

public String getRsaPublicExp() {
return rsaPublicExp;
}

public void setRsaPublicExp(String rsaPublicExp) {
this.rsaPublicExp = rsaPublicExp;
}

public String getRsaPrivateExp() {
return rsaPrivateExp;
}

public void setRsaPrivateExp(String rsaPrivateExp) {
this.rsaPrivateExp = rsaPrivateExp;
}

public String getRsaFirstPrimeFactor() {
return rsaFirstPrimeFactor;
}

public void setRsaFirstPrimeFactor(String rsaFirstPrimeFactor) {
this.rsaFirstPrimeFactor = rsaFirstPrimeFactor;
}

public String getRsaSecondPrimeFactor() {
return rsaSecondPrimeFactor;
}

public void setRsaSecondPrimeFactor(String rsaSecondPrimeFactor) {
this.rsaSecondPrimeFactor = rsaSecondPrimeFactor;
}

public String getRsaFirstPrimeCrt() {
return rsaFirstPrimeCrt;
}

public void setRsaFirstPrimeCrt(String rsaFirstPrimeCrt) {
this.rsaFirstPrimeCrt = rsaFirstPrimeCrt;
}

public String getRsaSecondPrimeCrt() {
return rsaSecondPrimeCrt;
}

public void setRsaSecondPrimeCrt(String rsaSecondPrimeCrt) {
this.rsaSecondPrimeCrt = rsaSecondPrimeCrt;
}

public String getRsaFirstCrtCoefficient() {
return rsaFirstCrtCoefficient;
}

public void setRsaFirstCrtCoefficient(String rsaFirstCrtCoefficient) {
this.rsaFirstCrtCoefficient = rsaFirstCrtCoefficient;
}

@Override
public String toString() {
return "OnBehalfOf [signing_key=" + signingKey + ", encryption_key=" + encryptionKey + ", algorithm=" + algorithm +
", signing_key=" + signingKey + ", ec_private_key=" + ecPrivateKey + ", ec_private=" + ecPrivate + ", ec_x=" + ecXCoordinate + ", ec_y=" + ecYCoordinate + ", rsa_private_key=" + rsaPrivateKey +
", rsa_modulus=" + rsaModulus + ", rsa_public_exp=" + rsaPublicExp + ", rsa_private_exp=" + rsaPrivateExp +
", rsa_first_prime_factor=" + rsaFirstPrimeFactor + ", rsa_second_prime_factor=" + rsaSecondPrimeFactor +
", rsa_first_prime_crt=" + rsaFirstPrimeCrt + ", rsa_second_prime_crt=" + rsaSecondPrimeCrt + ", rsa_first_crt_coefficient=" + rsaFirstCrtCoefficient + "]";
}
}

}
Loading

0 comments on commit cf8d2c9

Please sign in to comment.