You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ra...@apache.org on 2019/09/13 21:12:47 UTC
[sling-org-apache-sling-committer-cli] branch master updated:
trivial: corrected minor bugs
This is an automated email from the ASF dual-hosted git repository.
radu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-committer-cli.git
The following commit(s) were added to refs/heads/master by this push:
new b324fb8 trivial: corrected minor bugs
b324fb8 is described below
commit b324fb867ab385db62e7d0f4d967a2b408be7119
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Fri Sep 13 23:12:39 2019 +0200
trivial: corrected minor bugs
---
.../java/org/apache/sling/cli/impl/mail/Mailer.java | 16 +++++++++-------
.../sling/cli/impl/nexus/RepositoryService.java | 4 +++-
.../org/apache/sling/cli/impl/pgp/HashValidator.java | 19 ++++++++++---------
.../sling/cli/impl/pgp/PGPSignatureValidator.java | 7 +++----
.../sling/cli/impl/release/VerifyReleasesCommand.java | 4 ++--
5 files changed, 27 insertions(+), 23 deletions(-)
diff --git a/src/main/java/org/apache/sling/cli/impl/mail/Mailer.java b/src/main/java/org/apache/sling/cli/impl/mail/Mailer.java
index 7d03543..2ea3597 100644
--- a/src/main/java/org/apache/sling/cli/impl/mail/Mailer.java
+++ b/src/main/java/org/apache/sling/cli/impl/mail/Mailer.java
@@ -41,13 +41,15 @@ public class Mailer {
private static final Logger LOGGER = LoggerFactory.getLogger(Mailer.class);
- private static final Properties SMTP_PROPERTIES = new Properties() {{
- put("mail.smtp.host", "mail-relay.apache.org");
- put("mail.smtp.port", "465");
- put("mail.smtp.auth", "true");
- put("mail.smtp.socketFactory.class", "javax.net.ssl.SSLSocketFactory");
- put("mail.smtp.socketFactory.fallback", "false");
- }};
+ private static final Properties SMTP_PROPERTIES = new Properties();
+ static {
+
+ SMTP_PROPERTIES.put("mail.smtp.host", "mail-relay.apache.org");
+ SMTP_PROPERTIES.put("mail.smtp.port", "465");
+ SMTP_PROPERTIES.put("mail.smtp.auth", "true");
+ SMTP_PROPERTIES.put("mail.smtp.socketFactory.class", "javax.net.ssl.SSLSocketFactory");
+ SMTP_PROPERTIES.put("mail.smtp.socketFactory.fallback", "false");
+ };
@Reference
private CredentialsService credentialsService;
diff --git a/src/main/java/org/apache/sling/cli/impl/nexus/RepositoryService.java b/src/main/java/org/apache/sling/cli/impl/nexus/RepositoryService.java
index 3a19db4..5483f5a 100644
--- a/src/main/java/org/apache/sling/cli/impl/nexus/RepositoryService.java
+++ b/src/main/java/org/apache/sling/cli/impl/nexus/RepositoryService.java
@@ -208,7 +208,9 @@ public class RepositoryService {
String fileName = relativeFilePath.substring(relativeFilePath.lastIndexOf('/') + 1);
Path filePath = Files.createFile(artifactFolderPath.resolve(fileName));
HttpGet get = new HttpGet(repository.getRepositoryURI() + "/" + relativeFilePath);
- LOGGER.debug("Downloading " + get.getURI().toString());
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("Downloading {}.", get.getURI().toString());
+ }
try (CloseableHttpResponse response = client.execute(get)) {
try (InputStream content = response.getEntity().getContent()) {
IOUtils.copyLarge(content, Files.newOutputStream(filePath));
diff --git a/src/main/java/org/apache/sling/cli/impl/pgp/HashValidator.java b/src/main/java/org/apache/sling/cli/impl/pgp/HashValidator.java
index 46c8957..5abd2a3 100644
--- a/src/main/java/org/apache/sling/cli/impl/pgp/HashValidator.java
+++ b/src/main/java/org/apache/sling/cli/impl/pgp/HashValidator.java
@@ -35,16 +35,17 @@ public class HashValidator {
public ValidationResult validate(Path artifact, Path hash, String algorithm) {
try {
MessageDigest digest = MessageDigest.getInstance(algorithm);
- InputStream artifactIS = Files.newInputStream(artifact);
- byte[] buff = new byte[4096];
- int read;
- while ((read = artifactIS.read(buff)) != -1) {
- digest.update(buff, 0, read);
+ try (InputStream artifactIS = Files.newInputStream(artifact)) {
+ byte[] buff = new byte[4096];
+ int read;
+ while ((read = artifactIS.read(buff)) != -1) {
+ digest.update(buff, 0, read);
+ }
+ byte[] hashed = digest.digest();
+ String actualHash = Hex.toHexString(hashed);
+ String expectedHash = Files.readString(hash, StandardCharsets.US_ASCII);
+ return new ValidationResult(actualHash.equalsIgnoreCase(expectedHash), expectedHash, actualHash);
}
- byte[] hashed = digest.digest();
- String actualHash = Hex.toHexString(hashed);
- String expectedHash = Files.readString(hash, StandardCharsets.US_ASCII);
- return new ValidationResult(actualHash.equalsIgnoreCase(expectedHash), expectedHash, actualHash);
} catch (NoSuchAlgorithmException | IOException e) {
throw new IllegalStateException(String.format("Cannot validate %s hash.", algorithm), e);
}
diff --git a/src/main/java/org/apache/sling/cli/impl/pgp/PGPSignatureValidator.java b/src/main/java/org/apache/sling/cli/impl/pgp/PGPSignatureValidator.java
index fe6d57a..d813061 100644
--- a/src/main/java/org/apache/sling/cli/impl/pgp/PGPSignatureValidator.java
+++ b/src/main/java/org/apache/sling/cli/impl/pgp/PGPSignatureValidator.java
@@ -59,7 +59,7 @@ public class PGPSignatureValidator {
private HttpClientFactory httpClientFactory;
private static final String KEYS_FILE = "/tmp/sling-keys.asc";
- private PGPPublicKeyRingCollection keyRing;
+ private PGPPublicKeyRingCollection keyRingCollection;
public ValidationResult verify(Path artifact, Path signature) {
try (InputStream fileStream = Files.newInputStream(artifact);
@@ -68,7 +68,7 @@ public class PGPSignatureValidator {
PGPObjectFactory pgpObjectFactory = new PGPObjectFactory(sigInputStream, new BcKeyFingerprintCalculator());
PGPSignatureList sigList = (PGPSignatureList) pgpObjectFactory.nextObject();
PGPSignature pgpSignature = sigList.get(0);
- PGPPublicKey key = keyRing.getPublicKey(pgpSignature.getKeyID());
+ PGPPublicKey key = keyRingCollection.getPublicKey(pgpSignature.getKeyID());
if (key == null) {
throw new IllegalStateException(String
.format("Signature %s was not generated with any of the known keys.", signature.getFileName()));
@@ -79,7 +79,6 @@ public class PGPSignatureValidator {
while ((read = fileStream.read(buff)) != -1) {
pgpSignature.update(buff, 0, read);
}
- fileStream.close();
return new ValidationResult(pgpSignature.verify(), key);
} catch (PGPException | IOException e) {
throw new IllegalStateException(String.format("Unable to verify signature %s.", signature.getFileName()),
@@ -122,7 +121,7 @@ public class PGPSignatureValidator {
}
}
if (!keyRings.isEmpty()) {
- keyRing = new PGPPublicKeyRingCollection(keyRings);
+ keyRingCollection = new PGPPublicKeyRingCollection(keyRings);
} else {
throw new IllegalStateException(String.format("Sling keys file from %s does not contain any keys.", keysFile));
}
diff --git a/src/main/java/org/apache/sling/cli/impl/release/VerifyReleasesCommand.java b/src/main/java/org/apache/sling/cli/impl/release/VerifyReleasesCommand.java
index 392f09a..b5a16bf 100644
--- a/src/main/java/org/apache/sling/cli/impl/release/VerifyReleasesCommand.java
+++ b/src/main/java/org/apache/sling/cli/impl/release/VerifyReleasesCommand.java
@@ -116,8 +116,8 @@ public class VerifyReleasesCommand implements Command {
CIStatusValidator.ValidationResult ciValidationResult = ciStatusValidator.isValid(artifact,
artifactFilePath);
LOGGER.info("CI Status: {}",
- ciValidationResult.isValid() ? String.format("VALID: \n%s", ciValidationResult.getMessage())
- : String.format("INVALID: \n%s", ciValidationResult.getMessage()));
+ ciValidationResult.isValid() ? String.format("VALID: %n%s", ciValidationResult.getMessage())
+ : String.format("INVALID: %n%s", ciValidationResult.getMessage()));
checksRun++;
if (!ciValidationResult.isValid()) {
failedChecks++;