Skip to content

Include SpdxFiles with no name in the package verification code #459

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
arpitjain099 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Include SpdxFiles with no name in the package verification code #459

Show file tree
Hide file tree
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
4 changes: 3 additions & 1 deletion src/main/java/org/spdx/utility/verificationcode/VerificationCodeGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,9 @@ public SpdxPackageVerificationCode generatePackageVerificationCode(SpdxFile[] sp
for (SpdxFile spdxFile : spdxFiles) {
if (spdxFile != null) {
Optional<String> name = spdxFile.getName();
if (name.isPresent() && !skippedFilePathSet.contains(name.get())) {
// a file with no name can not match any of the skipped file paths,
// so it still contributes its checksum to the verification code
if (!name.isPresent() || !skippedFilePathSet.contains(name.get())) {
fileChecksums.add(spdxFile.getSha1());
}
}
Expand Down
27 changes: 27 additions & 0 deletions src/test/java/org/spdx/utility/verificationcode/VerificationCodeGeneratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,14 @@ public class VerificationCodeGeneratorTest extends TestCase {
"cccc9215216045864ca5785d1892a00106cf0f6a"
};

private static final String UNNAMED_FILE_SHA1 = "eeee9215216045864ca5785d1892a00106cf0f6a";

/** SHA-1 over the sorted SHA1s of SPDX_FILES[0] and the unnamed file */
private static final String NAMED_AND_UNNAMED_RESULT = "8c1104b80174143709b50afec3c3f3b3ff74b9cc";

/** SHA-1 over the unnamed file's SHA1 alone, with SPDX_FILES[0] excluded by path */
private static final String UNNAMED_ONLY_RESULT = "2e751eadfa9dd28547a3861d6a791d7abe61afea";

private SpdxFile[] SPDX_FILES;

private IModelStore modelStore;
Expand Down Expand Up @@ -120,6 +128,25 @@ private void compareFileNameArrays(String[] skippedFileNames,
}
}

public void testGeneratePackageVerificationCodeFileWithoutName() throws NoSuchAlgorithmException, InvalidSPDXAnalysisException {
VerificationCodeGenerator vg = new VerificationCodeGenerator(new JavaSha1ChecksumGenerator());
SpdxFile unnamed = new SpdxFile(modelStore, DOCUMENT_URI, modelStore.getNextId(IdType.Anonymous), null, true);
unnamed.getFileTypes().add(FileType.SOURCE);
unnamed.getChecksums().add(unnamed.createChecksum(ChecksumAlgorithm.SHA1, UNNAMED_FILE_SHA1));
unnamed.setLicenseConcluded(new SpdxNoAssertionLicense());
unnamed.getLicenseInfoFromFiles().add(new SpdxNoAssertionLicense());
assertFalse(unnamed.getName().isPresent());

SpdxFile[] files = new SpdxFile[] { SPDX_FILES[0], unnamed };
SpdxPackageVerificationCode vc = vg.generatePackageVerificationCode(files, new String[0], modelStore, DOCUMENT_URI);
assertEquals(NAMED_AND_UNNAMED_RESULT, vc.getValue());

String[] skipped = new String[] { SPDX_FILE_NAMES[0] };
SpdxPackageVerificationCode skippedVc = vg.generatePackageVerificationCode(files, skipped, modelStore, DOCUMENT_URI);
assertEquals(UNNAMED_ONLY_RESULT, skippedVc.getValue());
assertEquals(1, skippedVc.getExcludedFileNames().size());
}

public void testNormalizeFilePath() {
String s1 = "simple/test.c";
String ns1 = "./simple/test.c";
Expand Down
Loading