Skip to content

add file name fall back in check algorithm #8654

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
+17 −10
Open

add file name fall back in check algorithm #8654

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 17 additions & 10 deletions nbbuild/antsrc/org/netbeans/nbbuild/extlibs/CheckEmbeddedBinaries.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,9 @@
import java.nio.file.Path;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.logging.Logger;
import java.util.stream.Stream;

import org.apache.tools.ant.BuildException;
Expand Down Expand Up @@ -67,7 +68,7 @@ public void execute() throws BuildException {
boolean success = true;

File manifest = shalist;
Map<String,String> shamap = new HashMap<>();
Map<String,String> shamap = new LinkedHashMap<>();
log("Scanning: " + manifest, Project.MSG_VERBOSE);
try {
try (InputStream is = new FileInputStream(manifest)) {
Expand All @@ -80,40 +81,46 @@ public void execute() throws BuildException {
if (line.trim().length() == 0) {
continue;
}
String[] hashAndFile = line.split(";", 2);
String[] hashAndFile = line.split(";", 3);
if (hashAndFile.length < 2) {
throw new BuildException("Bad line '" + line + "' in " + manifest, getLocation());
}

if (MavenCoordinate.isMavenFile(hashAndFile[1])) {
MavenCoordinate mc = MavenCoordinate.fromGradleFormat(hashAndFile[1]);
shamap.put(hashAndFile[0], mc.toArtifactFilename());
} else {
throw new BuildException("Invalid manifest entry should be Maven coordinate", getLocation());
} else if (hashAndFile.length >= 3 && Files.isReadable(dir.toPath().resolve(hashAndFile[2]))){
shamap.put(hashAndFile[0], hashAndFile[2]);
} else{
throw new BuildException("Invalid manifest entry should be Maven coordinate: "+hashAndFile[1], getLocation());
}
}
}
} catch (IOException x) {
throw new BuildException("Could not open " + manifest + ": " + x, x, getLocation());
}

for (Map.Entry<String, String> entry : shamap.entrySet()) {
log ("sha entry "+ entry.getKey()+" = "+entry.getValue());
}
try (Stream<Path> list = Files.list(dir.toPath())) {
try (Stream<Path> list = Files.list(dir.toPath()).sorted((a,b)-> a.getFileName().toString().compareTo(b.getFileName().toString()))) {
StringBuilder errorList = new StringBuilder();
list.forEach((t) -> {
String sha1 = hash(t.toFile());
String filename = shamap.get(sha1);
// log("visiting "+t.toString());
if (filename == null) {
errorList.append("No sha1 (expected ").append(sha1).append(" for file: ").append(t.getFileName()).append("\n");
} else if (!filename.equals(t.getFileName().toString())) {
errorList.append("Wrong filename for hash (expected ").append(filename).append(" but got: ").append(t.getFileName()).append("\n");
}
});
if (errorList.toString().length()>0) {
log(""+errorList.toString());
throw new BuildException("Missing Sha1 file", getLocation());
if (! errorList.isEmpty()) {
// log(""+errorList.toString());
throw new BuildException("Errors while processing files:\n"+errorList, getLocation());
}
} catch (IOException ex) {
throw new BuildException("Invalid manifest entry should be Maven coordinate", getLocation());
throw new BuildException("Invalid manifest entry should be Maven coordinate: "+ex.getMessage(), getLocation());
}
if (!success) {
throw new BuildException("Failed to download binaries - see log message for the detailed reasons.", getLocation());
Expand Down