Skip to content

fix: Remove appSecret from sandbox-beforesign response header[#6402] #6417

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
Aias00 merged 3 commits into from
Jul 7, 2026
+36 −4
Merged

fix: Remove appSecret from sandbox-beforesign response header[#6402] #6417

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
01b20aa
fix: Remove appSecret from sandbox-beforesign response header[#6402]
hengyuss Jul 7, 2026
6b1a085
Merge branch 'master' into fix/remove_appSecret_from_sandbox_beforesi…
Aias00 Jul 7, 2026
707e1b3
Merge branch 'master' into fix/remove_appSecret_from_sandbox_beforesi…
Aias00 Jul 7, 2026
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
10 changes: 6 additions & 4 deletions shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/SandboxServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,12 @@ public void requestProxyGateway(final ProxyGatewayDTO proxyGatewayDTO, final Htt
throw new ShenyuException(proxyHostPort + " is not allowed.");
}

String signContent = null;
String sign = null;
String timestamp = String.valueOf(Instant.now().toEpochMilli());
if (StringUtils.isNotEmpty(appKey)) {
String timestamp = String.valueOf(Instant.now().toEpochMilli());
String secureKey = getSecureKey(appKey);
Assert.notBlack(secureKey, Constants.SIGN_APP_KEY_IS_NOT_EXIST);
signContent = ShenyuSignatureUtils.getSignContent(secureKey, timestamp, uriComponents.getPath());
String signContent = ShenyuSignatureUtils.getSignContent(secureKey, timestamp, uriComponents.getPath());
sign = ShenyuSignatureUtils.generateSign(signContent);
header.put("timestamp", timestamp);
header.put("appKey", appKey);
Expand All @@ -114,7 +113,10 @@ public void requestProxyGateway(final ProxyGatewayDTO proxyGatewayDTO, final Htt
return;
}
if (StringUtils.isNotEmpty(appKey)) {
response.addHeader("sandbox-beforesign", UriUtils.encode(signContent, StandardCharsets.UTF_8));
String signContentWithoutSecret = "path" + uriComponents.getPath()
+ "timestamp" + timestamp
+ "version" + ShenyuSignatureUtils.VERSION;
response.addHeader("sandbox-beforesign", UriUtils.encode(signContentWithoutSecret, StandardCharsets.UTF_8));
response.addHeader("sandbox-sign", UriUtils.encode(sign, StandardCharsets.UTF_8));
}

Expand Down
30 changes: 30 additions & 0 deletions shenyu-admin/src/test/java/org/apache/shenyu/admin/service/impl/SandboxServiceImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import java.util.Collections;

import org.apache.shenyu.admin.model.dto.ProxyGatewayDTO;
import org.apache.shenyu.admin.model.entity.AppAuthDO;
import org.apache.shenyu.admin.model.vo.ShenyuDictVO;
import org.apache.shenyu.admin.service.AppAuthService;
import org.apache.shenyu.admin.service.ShenyuDictService;
Expand Down Expand Up @@ -69,6 +70,35 @@ void requestProxyGatewayShouldCopyBody() throws IOException {
}
}

@Test
void requestProxyGatewayShouldNotExposeAppSecretInBeforeSignHeader() throws IOException {
HttpServer server = startHttpServer("proxied response");
int port = server.getAddress().getPort();
SandboxServiceImpl sandboxService = new SandboxServiceImpl(appAuthService, shenyuDictService);

when(shenyuDictService.list(anyString())).thenReturn(Collections.singletonList(buildDict(port)));

String testAppKey = "testAppKey";
String testAppSecret = "testSecret123";
AppAuthDO appAuthDO = new AppAuthDO(testAppKey, testAppSecret, true, true, null, null, null, null);
when(appAuthService.findByAppKey(testAppKey)).thenReturn(appAuthDO);

try {
MockHttpServletResponse response = new MockHttpServletResponse();
ProxyGatewayDTO dto = buildProxyGatewayDTO(port);
dto.setAppKey(testAppKey);
sandboxService.requestProxyGateway(dto, new MockHttpServletRequest(), response);

String beforesign = response.getHeader("sandbox-beforesign");
assertThat(beforesign).doesNotContain(testAppSecret);

String sign = response.getHeader("sandbox-sign");
assertThat(sign).isNotNull();
} finally {
server.stop(0);
}
}

private ProxyGatewayDTO buildProxyGatewayDTO(final int port) {
ProxyGatewayDTO proxyGatewayDTO = new ProxyGatewayDTO();
proxyGatewayDTO.setRequestUrl("http://localhost:" + port + "/proxy");
Expand Down
Loading