Skip to content

fix 301 redirect on https #2138

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
Ian-Nara merged 9 commits into from
Nov 6, 2025
Merged

fix 301 redirect on https #2138

Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
66c7a7d
fix 301 redirect on https
Ian-Nara Nov 6, 2025
85edc6b
[CI Pipeline] Released Snapshot version: 5.60.31-alpha-258-SNAPSHOT
Nov 6, 2025
aa54b92
Update pom.xml
Ian-Nara Nov 6, 2025
07a7919
refactor
Ian-Nara Nov 6, 2025
16ee517
Merge branch 'ian-UID2-6147-test-301-bugfix-2' of github.com:IABTechL…
Ian-Nara Nov 6, 2025
58abc6d
revert accidental commit
Ian-Nara Nov 6, 2025
ca67960
revert accidental commit
Ian-Nara Nov 6, 2025
1635d2a
[CI Pipeline] Released Snapshot version: 5.60.31-alpha-259-SNAPSHOT
Nov 6, 2025
5f045ed
Merge branch 'main' into ian-UID2-6147-test-301-bugfix-2
Ian-Nara Nov 6, 2025
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
14 changes: 11 additions & 3 deletions src/main/java/com/uid2/operator/store/CloudSyncOptOutStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ public class CloudSyncOptOutStore implements IOptOutStore {
private final String remoteApiHost;
private final String remoteApiPath;
private final String remoteApiBearerToken;
private final boolean remoteApiSsl;

public CloudSyncOptOutStore(Vertx vertx, ICloudStorage fsLocal, JsonObject jsonConfig, String operatorKey, Clock clock) throws MalformedURLException {
this.fsLocal = fsLocal;
Expand All @@ -61,7 +62,9 @@ public CloudSyncOptOutStore(Vertx vertx, ICloudStorage fsLocal, JsonObject jsonC
String remoteApi = jsonConfig.getString(Const.Config.OptOutApiUriProp);
if (remoteApi != null) {
URL url = new URL(remoteApi);
this.remoteApiPort = -1 == url.getPort() ? 80 : url.getPort();
boolean isHttps = "https".equalsIgnoreCase(url.getProtocol());
this.remoteApiSsl = isHttps;
this.remoteApiPort = -1 == url.getPort() ? (isHttps ? 443 : 80) : url.getPort();
Copy link
Contributor

@clarkxuyang clarkxuyang Nov 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this.remoteApiPort = url.getPort() != -1 ? url.getPort() : url.getDefaultPort();

this.remoteApiHost = url.getHost();
this.remoteApiPath = url.getPath();
this.remoteApiBearerToken = "Bearer " + operatorKey;
Expand All @@ -70,6 +73,7 @@ public CloudSyncOptOutStore(Vertx vertx, ICloudStorage fsLocal, JsonObject jsonC
this.remoteApiHost = null;
this.remoteApiPath = null;
this.remoteApiBearerToken = null;
this.remoteApiSsl = false;
}

this.snapshot.set(new OptOutStoreSnapshot(fsLocal, jsonConfig, clock));
Expand Down Expand Up @@ -101,13 +105,17 @@ public void addEntry(UserIdentity firstLevelHashIdentity,
return;
}

HttpRequest<String> request = this.webClient.post(remoteApiPort, remoteApiHost, remoteApiPath).
addQueryParam("identity_hash", EncodingUtils.toBase64String(firstLevelHashIdentity.id))
HttpRequest<String> request = this.webClient.post(remoteApiPort, remoteApiHost, remoteApiPath)
.addQueryParam("identity_hash", EncodingUtils.toBase64String(firstLevelHashIdentity.id))
.addQueryParam("advertising_id", EncodingUtils.toBase64String(advertisingId))
.putHeader("Authorization", remoteApiBearerToken)
.putHeader(Audit.UID_INSTANCE_ID_HEADER, uidInstanceId)
.as(BodyCodec.string());

if (remoteApiSsl) {
request = request.ssl(true);
}

JsonObject payload = new JsonObject();
if (email != null) payload.put("email", email);
if (phone != null) payload.put("phone", phone);
Expand Down
Loading