Skip to content

Commit e00d1b2

Browse files
author
Steve Salas
committed
Filter any duplicate surface endpoints
1 parent 3e86a0a commit e00d1b2

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

build.sbt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
val baseSettings = Seq(
22
organization := "com.codedx",
33
version := "UNVERSIONED",
4-
BuildKeys.releaseDate := "N/A",
5-
resolvers := Resolver.sonatypeRepo("snapshots") +: resolvers.value
4+
BuildKeys.releaseDate := "N/A"
65
)
76

87
val scalaSettings = Seq(

codepulse/src/main/scala/com/secdec/codepulse/surface/SurfaceDetector.scala

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,9 @@ object SurfaceDetector {
4949
val databases = frameworkTypes.asScala.map(f => EndpointDatabaseFactory.getDatabase(path, f))
5050

5151
if (!databases.isEmpty) {
52-
val endpoints = databases.flatMap(_.generateEndpoints().asScala)
53-
val flattenedEndpoints = EndpointUtil.flattenWithVariants(endpoints.asJavaCollection)
54-
for (flattenedEndpoint <- flattenedEndpoints.asScala)
55-
yield SurfaceEndpoint(flattenedEndpoint.getFilePath, flattenedEndpoint.getStartingLineNumber, flattenedEndpoint.getEndingLineNumber)
52+
databases.flatMap(_.generateEndpoints().asScala)
53+
.map(x => SurfaceEndpoint(x.getFilePath, x.getStartingLineNumber, x.getEndingLineNumber))
54+
.distinct
5655
} else {
5756
Seq.empty[SurfaceEndpoint]
5857
}

project/Dependencies.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ object Dependencies {
6363
)
6464
lazy val astamCorrelator = Seq(
6565
"org.jsoup" % "jsoup" % "1.11.3",
66-
"com.github.secdec.astam-correlator" % "master-pom" % "1.2.18-SNAPSHOT",
67-
"com.github.secdec.astam-correlator" % "threadfix-entities" % "1.2.18-SNAPSHOT",
68-
"com.github.secdec.astam-correlator" % "threadfix-ham" % "1.2.18-SNAPSHOT"
66+
"com.github.secdec.astam-correlator" % "master-pom" % "1.2.18",
67+
"com.github.secdec.astam-correlator" % "threadfix-entities" % "1.2.18",
68+
"com.github.secdec.astam-correlator" % "threadfix-ham" % "1.2.18"
6969
)
7070
lazy val juniversalchardet = "com.googlecode.juniversalchardet" % "juniversalchardet" % "1.0.3"
7171

0 commit comments

Comments
 (0)