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

Operator plaintext key field removal #69

Merged
merged 2 commits into from
Sep 27, 2023
Merged

Operator plaintext key field removal #69

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d687ac
Removed operator plaintext key field
gmsdelmundo Sep 21, 2023
07d98b7
Updated uid2-shared
gmsdelmundo Sep 27, 2023
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
5 changes: 1 addition & 4 deletions src/main/java/com/uid2/core/handler/AttestationFailureHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import io.vertx.core.json.JsonObject;
import io.vertx.core.net.SocketAddress;
import io.vertx.ext.web.RoutingContext;
import org.apache.commons.codec.digest.DigestUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -41,15 +40,13 @@ private void logAttestationFailure(RoutingContext context) {
final AttestationFailureReason attestationFailureReason = context.get(Const.RoutingContextData.ATTESTATION_FAILURE_REASON_PROP);
final String attestationFailureDataJson = getAttestationFailureDataJson(context);

final String operatorKeyHash = DigestUtils.sha256Hex(operatorKey.getKey());

final String originatingIpAddress = getOriginatingIpAddress(context);

LOG.warn("Attestation failed. StatusCode={} Reason={} Data={} OperatorKeyHash={} OperatorKeyName={} SiteId={} Protocol={} OperatorType={} OriginatingIpAddress={}",
context.response().getStatusCode(),
attestationFailureReason,
attestationFailureDataJson,
operatorKeyHash,
operatorKey.getKeyHash(),
operatorKey.getName(),
operatorKey.getSiteId(),
operatorKey.getProtocol(),
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/uid2/core/vertx/TestClientSideKeypairMetadataPath.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ private String getUrlForEndpoint(String endpoint) {
}

private void fakeAuth(OperatorType operatorType, int siteId) {
OperatorKey clientKey = new OperatorKey("test-key", "test-key-hash", "test-key-salt", "", "", attestationProtocol, 0, false, siteId, new HashSet<>(), operatorType);
when(authProvider.get(any())).thenReturn(clientKey);
OperatorKey operatorKey = new OperatorKey("test-key-hash", "test-key-salt", "", "", attestationProtocol, 0, false, siteId, new HashSet<>(), operatorType);
when(authProvider.get(any())).thenReturn(operatorKey);
}

private void get(Vertx vertx, String endpoint, String body, Handler<AsyncResult<HttpResponse<Buffer>>> handler) {
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/uid2/core/vertx/TestCoreVerticle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ private String getUrlForEndpoint(String endpoint) {
}

private void fakeAuth(Role... roles) {
OperatorKey clientKey = new OperatorKey("test-key", "test-key-hash", "test-key-salt", "test-name", "test-contact", attestationProtocol, 0, false, 88, new HashSet<>(Arrays.asList(roles)), OperatorType.PRIVATE);
when(authProvider.get(any())).thenReturn(clientKey);
OperatorKey operatorKey = new OperatorKey("test-key-hash", "test-key-salt", "test-name", "test-contact", attestationProtocol, 0, false, 88, new HashSet<>(Arrays.asList(roles)), OperatorType.PRIVATE);
when(authProvider.get(any())).thenReturn(operatorKey);
}

private void post(Vertx vertx, String endpoint, String body, Handler<AsyncResult<HttpResponse<Buffer>>> handler) {
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/uid2/core/vertx/TestServiceLinkMetadataPath.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ private String getUrlForEndpoint(String endpoint) {
}

private void fakeAuth(OperatorType operatorType, int siteId) {
OperatorKey clientKey = new OperatorKey("test-key", "test-key-hash", "test-key-salt", "", "", attestationProtocol, 0, false, siteId, new HashSet<>(), operatorType);
when(authProvider.get(any())).thenReturn(clientKey);
OperatorKey operatorKey = new OperatorKey("test-key-hash", "test-key-salt", "", "", attestationProtocol, 0, false, siteId, new HashSet<>(), operatorType);
when(authProvider.get(any())).thenReturn(operatorKey);
}

private void get(Vertx vertx, String endpoint, String body, Handler<AsyncResult<HttpResponse<Buffer>>> handler) {
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/uid2/core/vertx/TestServiceMetadataPath.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ private String getUrlForEndpoint(String endpoint) {
}

private void fakeAuth(OperatorType operatorType, int siteId) {
OperatorKey clientKey = new OperatorKey("test-key", "test-key-hash", "test-key-salt", "", "", attestationProtocol, 0, false, siteId, new HashSet<>(), operatorType);
when(authProvider.get(any())).thenReturn(clientKey);
OperatorKey operatorKey = new OperatorKey("test-key-hash", "test-key-salt", "", "", attestationProtocol, 0, false, siteId, new HashSet<>(), operatorType);
when(authProvider.get(any())).thenReturn(operatorKey);
}

private void get(Vertx vertx, String endpoint, String body, Handler<AsyncResult<HttpResponse<Buffer>>> handler) {
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/uid2/core/vertx/TestSiteSpecificMetadataPath.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ private String getUrlForEndpoint(String endpoint) {
}

private void fakeAuth(OperatorType operatorType, int siteId) {
OperatorKey clientKey = new OperatorKey("test-key", "test-key-hash", "test-key-salt", "", "", attestationProtocol, 0, false, siteId, new HashSet<>(), operatorType);
when(authProvider.get(any())).thenReturn(clientKey);
OperatorKey operatorKey = new OperatorKey("test-key-hash", "test-key-salt", "", "", attestationProtocol, 0, false, siteId, new HashSet<>(), operatorType);
when(authProvider.get(any())).thenReturn(operatorKey);
}

private void get(Vertx vertx, String endpoint, String body, Handler<AsyncResult<HttpResponse<Buffer>>> handler) {
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/uid2/core/vertx/TestSiteSpecificMetadataPathDisabled.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ private String getUrlForEndpoint(String endpoint) {
}

private void fakeAuth(OperatorType operatorType, int siteId) {
OperatorKey clientKey = new OperatorKey("test-key", "test-key-hash", "test-key-salt", "", "", attestationProtocol, 0, false, siteId, new HashSet<>(), operatorType);
when(authProvider.get(any())).thenReturn(clientKey);
OperatorKey operatorKey = new OperatorKey("test-key-hash", "test-key-salt", "", "", attestationProtocol, 0, false, siteId, new HashSet<>(), operatorType);
when(authProvider.get(any())).thenReturn(operatorKey);
}

private void get(Vertx vertx, String endpoint, String body, Handler<AsyncResult<HttpResponse<Buffer>>> handler) {
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/uid2/core/vertx/TestSitesMetadataPath.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ private String getUrlForEndpoint(String endpoint) {
}

private void fakeAuth(OperatorType operatorType, int siteId) {
OperatorKey clientKey = new OperatorKey("test-key", "test-key-hash", "test-key-salt", "", "", attestationProtocol, 0, false, siteId, new HashSet<>(), operatorType);
when(authProvider.get(any())).thenReturn(clientKey);
OperatorKey operatorKey = new OperatorKey("test-key-hash", "test-key-salt", "", "", attestationProtocol, 0, false, siteId, new HashSet<>(), operatorType);
when(authProvider.get(any())).thenReturn(operatorKey);
}

private void get(Vertx vertx, String endpoint, String body, Handler<AsyncResult<HttpResponse<Buffer>>> handler) {
Expand Down