Skip to content

Commit 6abcf93

Browse files
authored
fix(discovery): pass JWT via header, not query param (#768)
1 parent 4b0963d commit 6abcf93

File tree

1 file changed

+7
-22
lines changed

1 file changed

+7
-22
lines changed

src/main/java/io/cryostat/agent/CryostatClient.java

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ public class CryostatClient {
7575
private static final String DISCOVERY_API_PATH = "/api/v4/discovery";
7676
private static final String CREDENTIALS_API_PATH = "/api/v4/credentials";
7777
private static final String CHECK_CREDENTIAL_API_PATH = "/api/beta/discovery/credential_exists";
78+
private static final String DISCOVERY_TOKEN_HEADER = "Cryostat-Discovery-Authentication";
7879

7980
private final Logger log = LoggerFactory.getLogger(getClass());
8081

@@ -132,14 +133,8 @@ public CompletableFuture<Boolean> checkRegistration(PluginInfo pluginInfo) {
132133
if (!pluginInfo.isInitialized()) {
133134
return CompletableFuture.completedFuture(false);
134135
}
135-
HttpGet req =
136-
new HttpGet(
137-
baseUri.resolve(
138-
DISCOVERY_API_PATH
139-
+ "/"
140-
+ pluginInfo.getId()
141-
+ "?token="
142-
+ pluginInfo.getToken()));
136+
HttpGet req = new HttpGet(baseUri.resolve(DISCOVERY_API_PATH + "/" + pluginInfo.getId()));
137+
req.addHeader(DISCOVERY_TOKEN_HEADER, pluginInfo.getToken());
143138
log.trace("{}", req);
144139
return supply(req, (res) -> logResponse(req, res))
145140
.thenApply(this::isOkStatus)
@@ -335,13 +330,8 @@ public CompletableFuture<Void> deleteCredentials(int id) {
335330

336331
public CompletableFuture<Void> deregister(PluginInfo pluginInfo) {
337332
HttpDelete req =
338-
new HttpDelete(
339-
baseUri.resolve(
340-
DISCOVERY_API_PATH
341-
+ "/"
342-
+ pluginInfo.getId()
343-
+ "?token="
344-
+ pluginInfo.getToken()));
333+
new HttpDelete(baseUri.resolve(DISCOVERY_API_PATH + "/" + pluginInfo.getId()));
334+
req.addHeader(DISCOVERY_TOKEN_HEADER, pluginInfo.getToken());
345335
log.trace("{}", req);
346336
return supply(req, (res) -> logResponse(req, res))
347337
.thenApply(res -> assertOkStatus(req, res))
@@ -353,13 +343,8 @@ public CompletableFuture<Void> update(
353343
PluginInfo pluginInfo, Collection<DiscoveryNode> subtree) {
354344
try {
355345
HttpPost req =
356-
new HttpPost(
357-
baseUri.resolve(
358-
DISCOVERY_API_PATH
359-
+ "/"
360-
+ pluginInfo.getId()
361-
+ "?token="
362-
+ pluginInfo.getToken()));
346+
new HttpPost(baseUri.resolve(DISCOVERY_API_PATH + "/" + pluginInfo.getId()));
347+
req.addHeader(DISCOVERY_TOKEN_HEADER, pluginInfo.getToken());
363348
req.setEntity(
364349
new StringEntity(
365350
mapper.writeValueAsString(subtree), ContentType.APPLICATION_JSON));

0 commit comments

Comments
 (0)