Merge pull request #13 from tt-gf/new-master

Sync with upstream repository

Author: martinm82

.github/workflows/cla.yml

@@ -0,0 +1,35 @@
+name: "CLA Assistant"
+on:
+  # issue_comment triggers this action on each comment on issues and pull requests
+  issue_comment:
+    types: [created]
+  pull_request_target:
+    types: [opened,synchronize]
+
+jobs:
+  CLAssistant:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions-ecosystem/action-regex-match@v2
+        id: sign-or-recheck
+        with:
+          text: ${{ github.event.comment.body }}
+          regex: '\s*(I have read the CLA Document and I hereby sign the CLA)|(recheckcla)\s*'
+      
+      - name: "CLA Assistant"
+        if: ${{ steps.sign-or-recheck.outputs.match != '' || github.event_name == 'pull_request_target' }}
+        # Alpha Release
+        uses: cla-assistant/[email protected]
+        env:
+          # Generated and maintained by github
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          # JFrog organization secret
+          PERSONAL_ACCESS_TOKEN : ${{ secrets.CLA_SIGN_TOKEN }}
+        with:
+          path-to-signatures: 'signed_clas.json'
+          path-to-document: 'https://jfrog.com/cla/'
+          remote-organization-name: 'jfrog'
+          remote-repository-name: 'jfrog-signed-clas'
+          # branch should not be protected
+          branch: 'master'
+          allowlist: bot*

.gitignore

@@ -7,4 +7,6 @@
 /.project
 /.gradle
 /.idea/
-*.iml
+*.iml
+
+.DS_Store

DB/DBSyncNotification/DBSyncNotificationTest.groovy

@@ -5,24 +5,36 @@ class DBSyncNotificationTest extends Specification {
     def 'db sync notif test'() {
         when:
         def auth = "Basic ${'admin:password'.bytes.encodeBase64()}"
-        def logs = 'http://localhost:8088/artifactory/api/systemlogs/logData?id=artifactory.log'
+        def logs = 'http://localhost:8088/artifactory/api/systemlogs/downloadFile?id=console.log'
         def sync = 'http://localhost:8081/artifactory/api/plugins/execute/syncNotification'
         def lastline = null, conn = null, lastlinum = -1, startlinum = -1
         // the test won't pass unless we wait for the HA nodes to connect
         def starttime = System.currentTimeMillis()
         while (true) {
             conn = new URL(logs).openConnection()
             conn.setRequestProperty('Authorization', auth)
+            if (conn.responseCode != 200) {
+                logs ='http://localhost:8088/artifactory/api/systemlogs/downloadFile?id=artifactory.log'
+                conn = new URL(logs).openConnection()
+                conn.setRequestProperty('Authorization', auth)
+            }
             assert conn.responseCode == 200
-            def oldlines = new JsonSlurper().parse(conn.inputStream).logContent.readLines()
+            def oldlines = new InputStreamReader(conn.inputStream).readLines()
             conn.disconnect()
             lastline = oldlines.findAll { it ==~ /.*\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d.*/ }[-1]
-            if (lastlinum > startlinum) break
             lastlinum = oldlines.findIndexOf { it == lastline }
-            startlinum = oldlines.findIndexOf { it.contains('Artifactory successfully started') }
+            startlinum = oldlines.findIndexOf { it.contains('All services started successfully') || it.contains('Artifactory successfully started') }
+            if (lastlinum > startlinum) break
+            if (System.currentTimeMillis() > starttime + 120000) {
+                if (startlinum > -1) {
+                    break
+                } else {
+                    throw new Exception("Failed to get last log line after Artifactory startup")
+                }
+            }
             System.sleep(5000)
-            assert System.currentTimeMillis() <= starttime + 120000
         }
+
         conn = new URL(sync).openConnection()
         conn.requestMethod = 'POST'
         conn.setRequestProperty('Authorization', auth)
@@ -32,7 +44,7 @@ class DBSyncNotificationTest extends Specification {
         conn = new URL(logs).openConnection()
         conn.setRequestProperty('Authorization', auth)
         assert conn.responseCode == 200
-        def lines = new JsonSlurper().parse(conn.inputStream).logContent.readLines()
+        def lines = new InputStreamReader(conn.inputStream).readLines()
         conn.disconnect()
         def idx = lines.findIndexOf { it == lastline }
         def newlines = lines[idx + 1 .. -1]

archive/archiveOldArtifacts/ArchiveOldArtifactsTest.groovy

@@ -2,13 +2,14 @@ import spock.lang.Specification
 
 import org.jfrog.artifactory.client.model.repository.settings.impl.MavenRepositorySettingsImpl
 
-import static org.jfrog.artifactory.client.ArtifactoryClient.create
+import org.jfrog.artifactory.client.ArtifactoryClientBuilder
 
 class ArchiveOldArtifactsTest extends Specification {
     def 'archive old artifacts plugin test'() {
         setup:
         def baseurl = 'http://localhost:8088/artifactory'
-        def artifactory = create(baseurl, 'admin', 'password')
+        def artifactory = ArtifactoryClientBuilder.create().setUrl(baseurl)
+            .setUsername('admin').setPassword('password').build()
 
         def builder = artifactory.repositories().builders()
         def local1 = builder.localRepositoryBuilder().key('maven-local')

archive/archiveOldArtifacts/archiveOldArtifacts.groovy

@@ -16,6 +16,7 @@
 
 import org.artifactory.exception.CancelException
 import org.artifactory.fs.StatsInfo
+import org.artifactory.model.xstream.fs.StatsImpl
 import org.artifactory.md.Properties
 import org.artifactory.repo.RepoPath
 import org.artifactory.repo.RepoPathFactory
@@ -376,6 +377,13 @@ boolean checkArchiveTimingPolicies(
     if (lastDownloadedDays != 0) {
         // Get the StatsInfo on the item
         def statsInfo = (StatsInfo) repositories.getStats(artifact)
+
+        // If artifact is never downloaded
+        if (statsInfo == null){
+            statsInfo = new StatsImpl()
+            statsInfo.lastDownloaded = itemInfo.getCreated()
+        }
+
         log.debug('Artifact {} stats info: {}', artifact, statsInfo)
 
         // Get the last downloaded date

backup/backupFolders/BackupFoldersTest.groovy

@@ -3,7 +3,7 @@ import org.jfrog.artifactory.client.model.repository.settings.impl.GenericReposi
 import org.jfrog.lilypad.Control
 import spock.lang.Specification
 
-import static org.jfrog.artifactory.client.ArtifactoryClient.create
+import org.jfrog.artifactory.client.ArtifactoryClientBuilder
 
 /*
  * Copyright (C) 2017 JFrog Ltd.
@@ -38,7 +38,7 @@ class BackupFoldersTest extends Specification {
         def backupFolder = "/tmp/backupfoldertest/${System.currentTimeMillis()}"
 
         setup:
-        def artifactory = create(baseurl, user, password)
+        def artifactory = ArtifactoryClientBuilder.create().setUrl(baseurl).setUsername(user).setPassword(password).build()
         // Create temporary folder to receive backup
         Control.createFolder(basePort, backupFolder)
         // Create repository
@@ -71,7 +71,7 @@ class BackupFoldersTest extends Specification {
         def backupFolder = "/tmp/backupfoldertest/${System.currentTimeMillis()}"
 
         setup:
-        def artifactory = create(baseurl, user, password)
+        def artifactory = ArtifactoryClientBuilder.create().setUrl(baseurl).setUsername(user).setPassword(password).build()
         // Create temporary folder to receive backup
         Control.createFolder(basePort, backupFolder)
         // Create repository

backup/backupFolders/backupFolders.groovy

@@ -61,7 +61,7 @@ jobs {
     backUpFolder(cron: "0 0 1 1/1 * ? *") {
         try {
             //getting the information from the properties file
-            def etcdir = ctx.artifactoryHome.haAwareEtcDir
+            def etcdir = ctx.artifactoryHome.etcDir
             def configFile = new ConfigSlurper().parse(new File(etcdir, "plugins/backupFolders.properties").toURL())
             startBackup(configFile.destinationFolder as String, configFile.pathToFolder as String)
 

build/atlassian/AtlassianTest.groovy

@@ -0,0 +1,96 @@
+import com.sun.net.httpserver.HttpExchange
+import com.sun.net.httpserver.HttpHandler
+import com.sun.net.httpserver.HttpServer
+import groovy.json.JsonBuilder
+import groovy.json.JsonSlurper
+import spock.lang.Specification
+import org.jfrog.artifactory.client.ArtifactoryClientBuilder
+
+class AtlassianTest extends Specification {
+    def 'atlassian plugin test'() {
+        setup:
+        def baseurl = 'http://localhost:8088/artifactory'
+        def auth = "Basic ${("admin:password").bytes.encodeBase64().toString()}"
+        def artifactory = ArtifactoryClientBuilder.create().setUrl(baseurl)
+            .setUsername('admin').setPassword('password').build()
+        def mockServer = new MockServer(port: 7990)
+        mockServer.start()
+
+        when:
+        def conn = new URL(baseurl + '/api/build').openConnection()
+        conn.setDoOutput(true)
+        conn.setRequestMethod('PUT')
+        conn.setRequestProperty('Content-Type', 'application/json')
+        conn.setRequestProperty('Authorization', auth)
+        def jsonPayload = new JsonBuilder([version: '1.0.1', name: 'atlassian-test-build', number: '1', type: 'GENERIC', agent: [name: "Jenkins", version: "1.0.0"], buildAgent: [name: "Maven", version: "1.0.0"], started: '2020-03-05T21:47:17.229+0000', durationMillis: 2292103, vcsUrl: "http://localhost:7990/foo/bar", vcsRevision: 'b2869957593381150d3d3fb854674396b69e51c7'])
+        conn.outputStream.withCloseable { output ->
+            output.write(jsonPayload.toString().bytes)
+        }
+        assert conn.responseCode == 204
+        mockServer.waitForMessage()
+
+        then:
+        mockServer.messageReceived == true
+        mockServer.validMessageReceived == true
+
+        cleanup:
+        mockServer?.stop()
+    }
+
+    class MockServer {
+        HttpServer server
+        int port = 7990
+        boolean messageReceived
+        boolean validMessageReceived
+
+        def start() {
+            InetSocketAddress address = new InetSocketAddress(port);
+            server = HttpServer.create(address, 0);
+            HttpHandler requestValidatorHandler = new HttpHandler() {
+                @Override
+                void handle(HttpExchange exchange) throws IOException {
+                    println "Mock server receive a new request"
+                    messageReceived = true
+                    def content = exchange.requestBody.text
+                    println "Message content: $content"
+                    validMessageReceived = isMessageContentValid(content)
+                    exchange.sendResponseHeaders(HttpURLConnection.HTTP_OK, 0)
+                    exchange.close()
+                }
+
+                boolean isMessageContentValid(content) {
+                    def jsonContent = new JsonSlurper().parseText(content)
+                    assert jsonContent.server == 'http://localhost:8088/artifactory'
+                    assert jsonContent.state == 'SUCCESSFUL'
+                    assert jsonContent.key == 'atlassian-test-build'
+                    assert jsonContent.resultKey == 'atlassian-test-build:1'
+                    assert jsonContent.name == 'atlassian-test-build'
+                    assert jsonContent.url == "http://localhost:8088/ui/builds/atlassian-test-build/1/1583444837229"
+                    assert jsonContent.description == "atlassian-test-build build 1 was successfully published to Artifactory at 2020-03-05T21:47:17.229+0000 by Jenkins/1.0.0 using tool Maven/1.0.0"
+                    assert jsonContent.duration == 2292.103
+                    return true
+                }
+            }
+            server.createContext("/rest/build-status/1.0/commits/b2869957593381150d3d3fb854674396b69e51c7", requestValidatorHandler)
+            server.start()
+            println "Mock server started"
+        }
+
+        def stop() {
+            server?.stop(0)
+            println "Mock server stopped"
+        }
+
+        def waitForMessage() {
+            println "Waiting up to 2 minutes for notification receiving..."
+            def initialTime = System.currentTimeMillis()
+            while (System.currentTimeMillis() - initialTime < 120000) {
+                sleep(5000)
+                if (this.messageReceived) {
+                    sleep (5000)
+                    break
+                }
+            }
+        }
+    }
+}

build/atlassian/README.md

@@ -0,0 +1,32 @@
+# Artifactory Atlassian Integration User Plugin
+
+This plugin provides some integration with Atlassian Bitbucket Server. It allows
+commits in Bitbucket to provide information and links to associated builds in
+Artifactory.
+
+## Usage
+
+When a build is deployed in Artifactory, the plugin automatically sends the
+build information to the configured Bitbucket Server. Bitbucket then adds the
+build to the appropriate commit, accessible through the "Builds" link in the top
+right:
+
+![commit](imgs/commit.png)
+
+![links](imgs/links.png)
+
+## Configuration
+
+The `atlassian.json` file should be modified to allow the plugin to access the
+Bitbucket server:
+
+``` json
+{
+    "bitbucketUrl": "http://localhost:7990",
+    "username": "admin",
+    "password": "password"
+}
+```
+
+The URL, username, and password should be changed to the correct location and
+login credentials.

build/atlassian/atlassian.groovy

@@ -0,0 +1,61 @@
+import groovy.json.JsonBuilder
+import groovy.json.JsonSlurper
+import java.text.SimpleDateFormat
+import java.text.ParseException
+
+import org.artifactory.build.DetailedBuildRunImpl
+import org.artifactory.request.RequestThreadLocal
+import org.artifactory.util.HttpUtils
+
+build {
+    afterSave { buildRun ->
+        def cfgfile = new File(ctx.artifactoryHome.etcDir, 'plugins/atlassian.json')
+        def cfg = new JsonSlurper().parse(cfgfile)
+        def arturl = ctx.centralConfig.descriptor.urlBase
+        if (!arturl) {
+            def req = RequestThreadLocal.context.get().requestThreadLocal
+            arturl = HttpUtils.getServletContextUrl(req.request)
+        }
+        arturl = arturl - ~'/artifactory/?$'
+        def build = (buildRun as DetailedBuildRunImpl).build
+        if (!build.vcsUrl?.startsWith(cfg.bitbucketUrl)) {
+            return
+        }
+        // Process the started date
+        def fmt = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ")
+        def date
+        try {
+            date = fmt.parse(build.started)
+        } catch (ParseException ex) {
+            log.warn("Unable to parse build started timestamp $build.started: $ex")
+            return
+        }
+        // Generate the build url
+        def buildurl = arturl + "/ui/builds/$build.name/$build.number/$date.time"
+        // Build the request body
+        def body = [:]
+        body.server = arturl + '/artifactory'
+        body.state = 'SUCCESSFUL'
+        body.key = build.name
+        body.resultKey = build.name + ':' + build.number
+        body.name = build.name
+        body.url = buildurl
+        body.description = "$build.name build $build.number was successfully published to Artifactory at $build.started by ${build.agent?.name}/${build.agent?.version} using tool ${build.buildAgent?.name}/${build.buildAgent?.version}"
+        body.duration = build.durationMillis/1000
+        def bodytext = new JsonBuilder(body).toPrettyString()
+        log.debug("Build triggered, payload follows:\n$bodytext")
+        def url = "$cfg.bitbucketUrl/rest/build-status/1.0/commits/$build.vcsRevision"
+        def auth = "Basic ${"$cfg.username:$cfg.password".bytes.encodeBase64().toString()}"
+        def conn = new URL(url).openConnection()
+        conn.doOutput = true
+        conn.requestMethod = 'POST'
+        conn.setRequestProperty('Content-Type', 'application/json')
+        conn.setRequestProperty('Authorization', auth)
+        conn.outputStream << bodytext
+        if (conn.responseCode == 204) {
+            log.debug("Success!")
+        } else {
+            log.debug("Failure. $conn.responseCode")
+        }
+    }
+}