Skip to content

Check for invalid object URIs #85

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

Closed
goneall wants to merge 1 commit into from
Closed

Check for invalid object URIs #85

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
7 changes: 7 additions & 0 deletions src/main/java/org/spdx/core/CoreModelObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
*/
package org.spdx.core;

import java.net.URI;
import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
Expand Down Expand Up @@ -127,6 +129,11 @@
if (!ModelRegistry.getModelRegistry().containsSpecVersion(specVersion)) {
throw new InvalidSPDXAnalysisException("Unknown spec version "+specVersion);
}
try {
URI uri = new URI(objectUri);

Check warning on line 133 in src/main/java/org/spdx/core/CoreModelObject.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Remove this unused "uri" local variable. 


See more on https://sonarcloud.io/project/issues?id=spdx-java-core&issues=AZ77ZzS4q8KnglQpoaZ6&open=AZ77ZzS4q8KnglQpoaZ6&pullRequest=85
} catch (URISyntaxException e) {
throw new InvalidSPDXAnalysisException("Invalid objectUri: "+objectUri, e);
}
this.modelStore = modelStore;
this.copyManager = copyManager;
this.objectUri = objectUri;
Expand Down
10 changes: 10 additions & 0 deletions src/test/java/org/spdx/core/TestCoreModelObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,4 +392,14 @@
assertEquals(OBJECT_URI, noPrefix.getId());
}

@Test
public void testInvalidObjectUri() {
try {
CoreModelObject prefix = new MockModelType(modelStore, "this is invalid", copyManager, true, "3.0.0");

Check warning on line 398 in src/test/java/org/spdx/core/TestCoreModelObject.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Remove this useless assignment to local variable "prefix". 


See more on https://sonarcloud.io/project/issues?id=spdx-java-core&issues=AZ77ZzQ2q8KnglQpoaZ4&open=AZ77ZzQ2q8KnglQpoaZ4&pullRequest=85

Check warning on line 398 in src/test/java/org/spdx/core/TestCoreModelObject.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Remove this unused "prefix" local variable. 


See more on https://sonarcloud.io/project/issues?id=spdx-java-core&issues=AZ77ZzQ2q8KnglQpoaZ5&open=AZ77ZzQ2q8KnglQpoaZ5&pullRequest=85
fail("Invalid object URI did not throw an exception");
} catch (InvalidSPDXAnalysisException e) {
// expected
}
}

}
Loading