Skip to content
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

Jump to bottom

Fix: Added fallback decoding for Base64 encoded strings #211

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix: Added fallback decoding for Base64 encoded strings #211

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3fe789e
Fix: Added fallback decoding for Base64 encoded strings
Chvalov May 30, 2024
cec73f2
fix comment - importWStalker
Chvalov May 31, 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
20 changes: 17 additions & 3 deletions src/main/java/com/nccgroup/loggerplusplus/imports/LoggerImport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,24 @@ public static ArrayList<HttpRequestResponse> importWStalker() {
String[] v = line.split(","); // Format: "base64(request),base64(response),url"

String url = v[3];
Base64Utils b64Decoder = LoggerPlusPlus.montoya.utilities().base64Utils();
HttpService httpService = HttpService.httpService(url);
HttpRequest httpRequest = HttpRequest.httpRequest(httpService, b64Decoder.decode(v[0], Base64DecodingOptions.URL));
HttpResponse httpResponse = HttpResponse.httpResponse(b64Decoder.decode(v[1], Base64DecodingOptions.URL));
Base64Utils b64Decoder = LoggerPlusPlus.montoya.utilities().base64Utils();

// Attempt to decode using standard Base64
ByteArray decodedRequest;
ByteArray decodedResponse;
try {
decodedRequest = b64Decoder.decode(v[0]);
decodedResponse = b64Decoder.decode(v[1]);
} catch (IllegalArgumentException e) {
// If decoding with standard Base64 fails, try URL-safe Base64 decoding
log.warn("Standard Base64 decoding failed, trying URL-safe Base64 decoding");
decodedRequest = b64Decoder.decode(v[0], Base64DecodingOptions.URL);
decodedResponse = b64Decoder.decode(v[1], Base64DecodingOptions.URL);
}

HttpRequest httpRequest = HttpRequest.httpRequest(httpService, decodedRequest);
HttpResponse httpResponse = HttpResponse.httpResponse(decodedResponse);
HttpRequestResponse requestResponse = HttpRequestResponse.httpRequestResponse(httpRequest, httpResponse);

requests.add(requestResponse);
Expand Down