Skip to content

Remove enforce https #74

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

Merged
merged 3 commits into from
Feb 21, 2024
Merged

Remove enforce https #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ea073ba
Remove enforce https setting
thomasm-ttd Feb 19, 2024
03aa068
Updating Shared
thomasm-ttd Feb 19, 2024
d659dc0
Update version of shared
thomasm-ttd Feb 21, 2024
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
1 change: 0 additions & 1 deletion conf/integ-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"service_instances": 1,
"storage_mock": true,
"enforce_https": false,
"att_token_enc_key": "<key-for-attestation-token>",
"att_token_enc_salt": "<salt-for-attestation-token>",
"optout_s3_folder": "optout/",
Expand Down
1 change: 0 additions & 1 deletion conf/local-e2e-docker-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"service_instances": 1,
"storage_mock": false,
"enforce_https": false,
"aws_s3_endpoint": "http://localstack:5001",
"optout_s3_bucket": "test-optout-bucket",
"pre_signed_url_expiry": 1800,
Expand Down
12 changes: 10 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,23 @@
<vertx.version>4.3.8</vertx.version>
<!-- check micrometer.version vertx-micrometer-metrics consumes before bumping up -->
<micrometer.version>1.1.0</micrometer.version>
<uid2-shared.version>6.1.0-649c2e7609</uid2-shared.version>
<uid2-shared.version>7.1.0-8e67b3a537</uid2-shared.version>
<image.version>${project.version}</image.version>
</properties>

<repositories>
<repository>
<id>snapshots-repo</id>
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
<releases><enabled>false</enabled></releases>
<snapshots><enabled>true</enabled></snapshots>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>com.uid2</groupId>
<artifactId>uid2-attestation-api</artifactId>
<version>1.4.0-e5df2e10aa</version>
<version>2.0.0-f968aec0e3</version>
</dependency>
<dependency>
<groupId>com.uid2</groupId>
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/com/uid2/optout/Main.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,8 @@ public Main(Vertx vertx, JsonObject config) throws Exception {
if (coreApiToken == null || coreApiToken.isBlank()) {
LOGGER.warn("Core Attest URL set, but the API Token is not set");
}
boolean enforceHttps = this.config.getBoolean("enforce_https", true);
var tokenRetriever = new AttestationTokenRetriever(vertx, coreAttestUrl, coreApiToken, appVersion, new NoAttestationProvider(), null, CloudUtils.defaultProxy);
UidCoreClient uidCoreClient = UidCoreClient.createNoAttest(coreApiToken, enforceHttps, tokenRetriever);
UidCoreClient uidCoreClient = UidCoreClient.createNoAttest(coreApiToken, tokenRetriever);
if (useStorageMock) uidCoreClient.setAllowContentFromLocalFileSystem(true);
this.fsOperatorKeyConfig = uidCoreClient;
contentStorage = uidCoreClient.getContentStorage();
Expand Down