Skip to content

Fixed the google webpush backend not supporting base64 padding in enc… #194

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed the google webpush backend not supporting base64 padding in enc… #194

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/main/java/nl/martijndwars/webpush/AbstractPushService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,11 +207,16 @@ protected final HttpRequest prepareRequest(Notification notification, Encoding e
headers.put("Authorization", "WebPush " + jws.getCompactSerialization());
}

//--- Remove padding as spec
//--- https://datatracker.ietf.org/doc/html/draft-ietf-webpush-vapid-01#section-4
String b64 = Base64.getUrlEncoder().encodeToString(pk);
if (b64.endsWith("=")) b64 = b64.substring(0, b64.length()-1);
if (headers.containsKey("Crypto-Key")) {
headers.put("Crypto-Key", headers.get("Crypto-Key") + ";p256ecdsa=" + Base64.getUrlEncoder().encodeToString(pk));
headers.put("Crypto-Key", headers.get("Crypto-Key") + ";p256ecdsa=" + b64);
} else {
headers.put("Crypto-Key", "p256ecdsa=" + Base64.getUrlEncoder().encodeToString(pk));
headers.put("Crypto-Key", "p256ecdsa=" + b64);
}

} else if (notification.isFcm() && getGcmApiKey() != null) {
headers.put("Authorization", "key=" + getGcmApiKey());
}
Expand Down