Merge pull request #20 from Ferlab-Ste-Justine/feat/1436-snyk

feat: CLIN-1460 - snyk + revoke token
Ferlab-Ste-Justine · Oct 21, 2022 · 34bb490 · 34bb490
2 parents 6f2786c + 7ceda61
commit 34bb490
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/build.sbt b/build.sbt
@@ -1,25 +1,24 @@
 
 name := "ferload-client"
 organization := "ca.ferlab"
-version := "0.1"
 
 javacOptions ++= Seq("-source", "1.8", "-target", "1.8")
 
-scalaVersion := "2.13.6"
+scalaVersion := "2.13.9"
 
 // some TUs write in a common config file
 Test / parallelExecution := false
 
 libraryDependencies += "info.picocli" % "picocli" % "4.6.1"
 libraryDependencies += "com.typesafe" % "config" % "1.4.1"
-libraryDependencies += "org.keycloak" % "keycloak-authz-client" % "12.0.3"
+libraryDependencies += "org.keycloak" % "keycloak-authz-client" % "17.0.1"
 libraryDependencies += "org.apache.httpcomponents" % "httpclient" % "4.5.13"
 libraryDependencies += "org.apache.commons" % "commons-lang3" % "3.12.0"
 libraryDependencies += "org.apache.commons" % "commons-csv" % "1.8"
 libraryDependencies += "commons-io" % "commons-io" % "2.11.0"
 libraryDependencies += "org.json" % "json" % "20210307"
 libraryDependencies += "com.auth0" % "java-jwt" % "3.18.2"
-libraryDependencies += "com.amazonaws" % "aws-java-sdk-s3" % "1.12.14"
+libraryDependencies += "com.amazonaws" % "aws-java-sdk-s3" % "1.12.261"
 libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.7" % "test"
 
 import sbtassembly.AssemblyPlugin.defaultUniversalScript

diff --git a/src/main/scala/ca/ferlab/ferload/client/Main.scala b/src/main/scala/ca/ferlab/ferload/client/Main.scala
@@ -11,7 +11,7 @@ import picocli.CommandLine.Command
 import java.io.File
 
 @Command(name = "ferload-client", mixinStandardHelpOptions = true,
-  version = Array("0.1"),
+  version = Array("1.3.1"),
   description = Array("Official Ferload Client command line interface for files download."),
   subcommands = Array(classOf[Configure], classOf[Download]))
 class Main extends Runnable {

diff --git a/src/main/scala/ca/ferlab/ferload/client/commands/Configure.scala b/src/main/scala/ca/ferlab/ferload/client/commands/Configure.scala
@@ -10,7 +10,7 @@ import picocli.CommandLine.{Command, Option}
 
 import java.util.Optional
 
-@Command(name = "configure", mixinStandardHelpOptions = true, description = Array(" Help configure this tool."), version = Array("0.1"))
+@Command(name = "configure", mixinStandardHelpOptions = true, description = Array(" Help configure this tool."))
 class Configure(userConfig: UserConfig, appConfig: Config, commandLine: ICommandLine, ferload: IFerload) extends BaseCommand(appConfig, commandLine) with Runnable {
 
   @Option(names = Array("-f", "--ferload-url"), description = Array("Ferload url"))
@@ -44,6 +44,8 @@ class Configure(userConfig: UserConfig, appConfig: Config, commandLine: ICommand
 
     userConfig.set(FerloadUrl, ferloadUrl.orElseGet(() => readLine("-f", currentFerloadUrl)))
     userConfig.set(Username, username.orElseGet(() => readLine("-u", currentUsername)))
+    // if username changed then revoke last token
+    if (!userConfig.get(Username).equals(currentUsername)) userConfig.remove(Token)
     println()
 
     val ferloadConfig: JSONObject = CommandBlock("Retrieve Ferload configuration", successEmoji) {

diff --git a/src/main/scala/ca/ferlab/ferload/client/commands/Download.scala b/src/main/scala/ca/ferlab/ferload/client/commands/Download.scala
@@ -15,8 +15,7 @@ import java.util.Optional
 import scala.collection.mutable
 import scala.util.{Failure, Success, Try, Using}
 
-@Command(name = "download", mixinStandardHelpOptions = true, description = Array("Download files based on provided manifest."),
-  version = Array("0.1"))
+@Command(name = "download", mixinStandardHelpOptions = true, description = Array("Download files based on provided manifest."))
 class Download(userConfig: UserConfig,
                appConfig: Config,
                commandLine: ICommandLine,

diff --git a/src/test/scala/ca/ferlab/ferload/client/commands/ConfigureTest.scala b/src/test/scala/ca/ferlab/ferload/client/commands/ConfigureTest.scala
@@ -69,5 +69,13 @@ class ConfigureTest extends AnyFunSuite with BeforeAndAfter {
     new CommandLine(new Configure(mockUserConfig, appTestConfig, mockCommandLineInf, mockFerloadInf)).execute("-r")
     assert(mockUserConfig.get(Username).equals("foo"))
   }
+
+  test("revoke user token") {
+    mockUserConfig.set(Username, "foo")
+    mockUserConfig.set(Token, "token")
+    new CommandLine(new Configure(mockUserConfig, appTestConfig, mockCommandLineInf, mockFerloadInf)).execute("-ubar")
+    assert(mockUserConfig.get(Username).equals("bar"))
+    assert(mockUserConfig.get(Token) == null)
+  }
 
 }