Skip to content

Check the real unknown attributes when applying vector #181

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
wants to merge 3 commits into from
Closed

Check the real unknown attributes when applying vector #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
00a96db
Check the real unknown attributes when applying vector
xaldama Dec 17, 2024
1c23f53
Merge branch 'master' into fix_parseVectorOnlyIfKnownAttributes
xaldama Dec 17, 2024
9c016c9
Added test cases for new functionality.
YanWittmann Dec 20, 2024
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
19 changes: 15 additions & 4 deletions libraries/ae-security/src/main/java/org/metaeffekt/core/security/cvss/CvssVector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import org.metaeffekt.core.security.cvss.processor.BakedCvssVectorScores;
import org.metaeffekt.core.security.cvss.processor.UniversalCvssCalculatorLinkGenerator;
import org.metaeffekt.core.security.cvss.v2.Cvss2;
import org.metaeffekt.core.security.cvss.v3.Cvss3P0;
import org.metaeffekt.core.security.cvss.v3.Cvss3P1;
import org.metaeffekt.core.security.cvss.v4P0.Cvss4P0;
import org.slf4j.Logger;
Expand Down Expand Up @@ -204,8 +205,13 @@ public boolean containsSource(CvssSource source) {

public int applyVector(String vector) {
if (vector == null) return 0;

final String normalizedVector = normalizeVector(vector);
return applyNormalizedVector(normalizedVector);
}

protected int applyNormalizedVector(String normalizedVector) {
if (normalizedVector == null) return 0;

if (normalizedVector.isEmpty()) return 0;

final String[] arguments = normalizedVector.split("/");
Expand Down Expand Up @@ -315,8 +321,11 @@ protected static String normalizeVector(String vector) {

public static <T extends CvssVector> T parseVectorOnlyIfKnownAttributes(String vector, Supplier<T> constructor) {
final T cvssVector = constructor.get();
final int unknownAttributes = cvssVector.applyVector(vector);
return unknownAttributes > 0 ? null : cvssVector;
final String normalizedVector = normalizeVector(vector);
final int knownAttributes = cvssVector.applyNormalizedVector(normalizedVector);
final int allAttributes = normalizedVector.split("/").length;

return allAttributes - knownAttributes > 0 ? null : cvssVector;
}

public static <T extends CvssVector> String getVersionName(Class<T> clazz) {
Expand Down Expand Up @@ -364,7 +373,9 @@ public static CvssVector parseVector(String vector) {

if (vector.startsWith("CVSS:2.0")) {
return new Cvss2(vector);
} else if (vector.startsWith("CVSS:3.1") || vector.startsWith("CVSS:3.0")) {
} else if (vector.startsWith("CVSS:3.0")) {
return new Cvss3P0(vector);
} else if (vector.startsWith("CVSS:3.1")) {
return new Cvss3P1(vector);
} else if (vector.startsWith("CVSS:4.0")) {
return new Cvss4P0(vector);
Expand Down
36 changes: 36 additions & 0 deletions libraries/ae-security/src/test/java/org/metaeffekt/core/security/cvss/VectorParsingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package org.metaeffekt.core.security.cvss;

import org.junit.Assert;
import org.junit.Test;
import org.metaeffekt.core.security.cvss.v2.Cvss2;
import org.metaeffekt.core.security.cvss.v3.Cvss3P0;
import org.metaeffekt.core.security.cvss.v3.Cvss3P1;
import org.metaeffekt.core.security.cvss.v4P0.Cvss4P0;

public class VectorParsingTest {

@Test
public void parseVectorWithUnknownPartsTest() {
Assert.assertNull(CvssVector.parseVector("AV:P/AC:L/AT:P/PR:H/UI:P/VC:N/VI:N/VA:N/SC:N/SI:N/SA:H/NO:O"));
Assert.assertNull(CvssVector.parseVector("AR:N/NO:O"));
}

@Test
public void parseVectorWithKnownPartsTest() {
Assert.assertEquals(
Cvss2.parseVector("AV:N/AC:L/Au:N/C:P/I:N/A:N/E:U/RL:W/RC:UR/CDP:L/TD:M/CR:M/IR:H/AR:L"),
CvssVector.parseVector("AV:N/AC:L/Au:N/C:P/I:N/A:N/E:U/RL:W/RC:UR/CDP:L/TD:M/CR:M/IR:H/AR:L"));
Assert.assertEquals(
Cvss3P0.parseVector("CVSS:3.0/AV:P/AC:H/PR:L/UI:R/S:C/C:H/I:L/A:H"),
CvssVector.parseVector("CVSS:3.0/AV:P/AC:H/PR:L/UI:R/S:C/C:H/I:L/A:H"));
Assert.assertEquals(
Cvss3P1.parseVector("CVSS:3.1/AV:N/AC:L/PR:H/UI:R/S:U/C:L/I:N/A:L"),
CvssVector.parseVector("CVSS:3.1/AV:N/AC:L/PR:H/UI:R/S:U/C:L/I:N/A:L"));
Assert.assertEquals(
Cvss3P1.parseVector("AV:N/AC:L/PR:H/UI:R/S:U/C:L/I:N/A:L"),
CvssVector.parseVector("AV:N/AC:L/PR:H/UI:R/S:U/C:L/I:N/A:L"));
Assert.assertEquals(
Cvss4P0.parseVector("CVSS:4.0/AV:P/AC:L/AT:P/PR:H/UI:P/VC:N/VI:N/VA:N/SC:N/SI:N/SA:H"),
CvssVector.parseVector("CVSS:4.0/AV:P/AC:L/AT:P/PR:H/UI:P/VC:N/VI:N/VA:N/SC:N/SI:N/SA:H"));
}
}
Loading