Merge pull request #413 from codacy-acme/master

add flag to skip ssl verification, default is false

Author: heliocodacy

README.md

@@ -204,6 +204,7 @@ Found [Clone] 7 duplicated lines with 10 tokens:
     * `--commit-uuid` [default: latest commit of current git branch] - Set the commit UUID that will receive the results on Codacy
     * `--skip-commit-uuid-validation` [default: false] - Force using a commit UUID even if it doesn't belong to the current git branch.
     * `--upload` [default: false] - Request to push results to Codacy
+    * `--skip-ssl-verification` [default: false] - Skip the SSL certificate verification when communicating with the Codacy API
     * `--parallel` [default: 2] - Number of tools to run in parallel
     * `--max-allowed-issues` [default: 0] - Maximum number of issues allowed for the analysis to succeed
     * `--fail-if-incomplete` [default: false] - Fail the analysis if any tool fails to run

cli/src/main/scala/com/codacy/analysis/cli/command/AnalyseCommand.scala

@@ -49,7 +49,9 @@ object AnalyseCommand {
         .stripSuffix("/") // a trailing slash breaks the tools fetching mechanism
 
     val codacyClientOpt: Option[CodacyClient] =
-      Credentials.get(environment, analyze.api, apiUrl).map(CodacyClient.apply)
+      Credentials
+        .get(environment, analyze.api, apiUrl)
+        .map(cred => CodacyClient.apply(cred, analyze.skipSslVerificationValue))
     val configuration: CLIConfiguration =
       CLIConfiguration(codacyClientOpt, environment, analyze, new CodacyConfigurationFileLoader)
     val formatter: Formatter =

cli/src/main/scala/com/codacy/analysis/cli/command/CLIApp.scala

@@ -146,6 +146,8 @@ final case class Analyze(
   skipCommitUuidValidation: Int @@ Counter = Tag.of(0),
   @ExtraName("u") @ValueDescription("If the results should be uploaded to the API")
   upload: Int @@ Counter = Tag.of(0),
+  @ExtraName("i") @ValueDescription("[default: false] - Skips ssl verification when comunicating with Codacy API")
+  skipSslVerification: Int @@ Counter = Tag.of(0),
   @ExtraName("p") @ValueDescription("The number of tools to run in parallel")
   parallel: Option[Int] = Option.empty,
   @ValueDescription("Allow tools to access the network")
@@ -175,6 +177,7 @@ final case class Analyze(
   val forceFilePermissionsValue: Boolean = forceFilePermissions.## > 0
   val ghCodeScanningCompatValue: Boolean = ghCodeScanningCompat.## > 0
   val skipCommitUuidValidationValue: Boolean = skipCommitUuidValidation.## > 0
+  val skipSslVerificationValue: Boolean = skipSslVerification.## > 0
 
 }
 

cli/src/test/scala/com/codacy/analysis/cli/CLISpec.scala

@@ -55,6 +55,19 @@ class CLISpec extends Specification with NoLanguageFeatures with FileMatchers {
           "b10790d724e5fd2ca98e8ba3711b6cb10d7f5e38")) must beLike {
         case Right((DefaultCommand(_), _, Some(parsed))) => parsed must beRight
       }
+      cli.parse(
+        Array(
+          "analyze",
+          "--directory",
+          "/tmp",
+          "--tool",
+          "pylint",
+          "--commit-uuid",
+          "b10790d724e5fd2ca98e8ba3711b6cb10d7f5e38",
+          "--upload",
+          "--skip-ssl-verification")) must beLike {
+        case Right((DefaultCommand(_), _, Some(parsed))) => parsed must beRight
+      }
     }
 
     "fail parse" in {

cli/src/test/scala/com/codacy/analysis/cli/configuration/CLIConfigurationSpec.scala

@@ -51,7 +51,7 @@ class CLIConfigurationSpec extends Specification with NoLanguageFeatures {
     commitUuid = commitUuid,
     extras = ExtraOptions(analyser = Analyser.defaultAnalyser.name))
   private val defaultEnvironment = new Environment(Map.empty)
-  private val httpHelper = new HttpHelper(remoteUrl, Map.empty)
+  private val httpHelper = new HttpHelper(remoteUrl, Map.empty, false)
 
   private val noRemoteConfigCodacyClient =
     new CodacyClient(apiCredentials, httpHelper)(ExecutionContext.global) {

core/src/main/scala/com/codacy/analysis/core/clients/CodacyClient.scala

@@ -196,20 +196,20 @@ class CodacyClient(credentials: Credentials, http: HttpHelper)(implicit context:
 
 object CodacyClient {
 
-  def apply(credentials: Credentials)(implicit context: ExecutionContext): CodacyClient = {
+  def apply(credentials: Credentials, allowUnsafeSSL: Boolean)(implicit context: ExecutionContext): CodacyClient = {
     credentials match {
       case ProjectToken(token, baseUrl) =>
         val headers: Map[String, String] = Map(
           ("project-token", token),
           // This is deprecated and is kept for backward compatibility. It will removed in the context of CY-1272
           ("project_token", token))
-        new CodacyClient(credentials, new HttpHelper(baseUrl, headers))
+        new CodacyClient(credentials, new HttpHelper(baseUrl, headers, allowUnsafeSSL))
       case APIToken(token, baseUrl, _, _, _) =>
         val headers: Map[String, String] = Map(
           ("api-token", token),
           // This is deprecated and is kept for backward compatibility. It will removed in the context of CY-1272
           ("api_token", token))
-        new CodacyClient(credentials, new HttpHelper(baseUrl, headers))
+        new CodacyClient(credentials, new HttpHelper(baseUrl, headers, allowUnsafeSSL))
     }
   }
 

core/src/main/scala/com/codacy/analysis/core/utils/HttpHelper.scala

@@ -2,22 +2,29 @@ package com.codacy.analysis.core.utils
 
 import io.circe.parser.parse
 import io.circe.{Json, ParsingFailure}
-import scalaj.http.{Http, HttpRequest, HttpResponse}
+import scalaj.http.{Http, HttpRequest, HttpResponse, HttpOptions}
 
-class HttpHelper(apiUrl: String, extraHeaders: Map[String, String]) {
+class HttpHelper(apiUrl: String, extraHeaders: Map[String, String], allowUnsafeSSL: Boolean) {
 
   private lazy val connectionTimeoutMs = 2000
   private lazy val readTimeoutMs = 5000
 
   private val remoteUrl = apiUrl + "/2.0"
 
+  private def httpOptions = if (allowUnsafeSSL) Seq(HttpOptions.allowUnsafeSSL) else Seq.empty
+
   def get(endpoint: String): Either[ParsingFailure, Json] = {
     val headers: Map[String, String] = Map("Content-Type" -> "application/json") ++ extraHeaders
 
     val response: HttpResponse[String] =
-      Http(s"$remoteUrl$endpoint").headers(headers).timeout(connectionTimeoutMs, readTimeoutMs).asString
+      Http(s"$remoteUrl$endpoint")
+        .headers(headers)
+        .timeout(connectionTimeoutMs, readTimeoutMs)
+        .options(httpOptions)
+        .asString
 
     parse(response.body)
+
   }
 
   def post(endpoint: String, dataOpt: Option[Json] = None): Either[ParsingFailure, Json] = {
@@ -26,7 +33,8 @@ class HttpHelper(apiUrl: String, extraHeaders: Map[String, String]) {
     } ++ extraHeaders
 
     val request: HttpRequest = dataOpt.map { data =>
-      Http(s"$remoteUrl$endpoint").postData(data.toString)
+      Http(s"$remoteUrl$endpoint").options(httpOptions).postData(data.toString)
+
     }.getOrElse(Http(s"$remoteUrl$endpoint"))
       .method("POST")
       .headers(headers)