Skip to content

Support jsign without google cloud platform #607

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
bschwert wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Support jsign without google cloud platform #607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c804d1
Support signing by jsign without google cloud
Jan 20, 2025
e6bbd38
Re-set error for google cloud tokens
Jan 20, 2025
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
23 changes: 16 additions & 7 deletions ...ice/signing/windows/src/main/java/org/eclipse/cbi/webservice/signing/windows/JSigner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,22 @@ public static Builder builder() {
@Override
public Path sign(Path file) {
try {
KeyStore keystore =
new KeyStoreBuilder()
.storetype(configuration().getStoreType())
.keystore(configuration().getKeystore())
.storepass(googleAccessToken())
.certfile(configuration().getCertificateChain().toFile())
.build();
KeyStoreBuilder keyStoreBuilder = new KeyStoreBuilder()
.storetype(configuration().getStoreType())
.keystore(configuration().getKeystore());
if (kmsCredentials!=null) {
keyStoreBuilder.storepass(googleAccessToken());
} else if (configuration().getStorePass() != null) {
keyStoreBuilder.storepass(configuration().getStorePass());
}
try {
if (configuration().getCertificateChain() != null) {
keyStoreBuilder.certfile(configuration().getCertificateChain().toFile());
}
} catch(IllegalArgumentException e){
// Ignore missing certficate chain;could be stored in keystore
}
KeyStore keystore =keyStoreBuilder.build();

AuthenticodeSigner signer =
new AuthenticodeSigner(keystore, configuration().getKeyAlias(), null)
Expand Down
5 changes: 5 additions & 0 deletions ...g/windows/src/main/java/org/eclipse/cbi/webservice/signing/windows/JSignerProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ public class JSignerProperties {
private static final String JSIGN_DESCRIPTION = "windows.jsign.description";

private static final String JSIGN_STORETYPE = "windows.jsign.storetype";
private static final String JSIGN_STOREPASS = "windows.jsign.storepass";
private static final String JSIGN_KEYSTORE = "windows.jsign.keystore";
private static final String JSIGN_KEY_ALIAS = "windows.jsign.keyalias";
private static final String JSIGN_CERTCHAIN = "windows.jsign.certchain";
Expand Down Expand Up @@ -67,6 +68,10 @@ public String getStoreType() {
return propertiesReader.getString(JSIGN_STORETYPE);
}

public String getStorePass() {
return propertiesReader.getString(JSIGN_STOREPASS);
}

public String getKeystore() {
return propertiesReader.getString(JSIGN_KEYSTORE);
}
Expand Down