Merge pull request #101 from jenkinsci/2.0-SNAPSHOT

Add option to disable SSL verification and security fix

Author: maduma

.github/workflows/release-drafter.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       # Drafts your next Release notes as Pull Requests are merged into "master"
-      - uses: release-drafter/release-drafter@v5.15.0
+      - uses: release-drafter/release-drafter@v5.20.0
         with:
           publish: startsWith(github.ref, "refs/tags")
         env:

CHANGELOG-old.md

@@ -3,6 +3,14 @@ Changelog
 
 The CHANGELOG is now maintained on the GitHub releases page: [Releases](https://github.com/jenkinsci/image-tag-parameter-plugin/releases)
 
+## v2.0 (Jul 23, 2022)
+* Add option to disable SSL verification for self-signed registry certificates
+* Bump credentials from 2.5 to 1139.veb_9579fca_33b_
+* Bump unirest-java from 3.11.11 to 3.13.10 
+* Bump release-drafter/release-drafter from 5.15.0 to 5.20.0
+* Bump plugin from 3.50 to 4.43.1
+* Bump jenkins version from 2.164.3 to 2.346.1
+
 ## v1.10.0 (Mar 22, 2021)
 * Handle AWS ECR credentials (#28) @lancehudson
 * fix(ordering): In rare ocassions TagOrder was null and lead to unexpected behaviour (#25) @h1dden-da3m0n

CONTRIBUTING.md

@@ -33,7 +33,7 @@ Caused by: java.lang.NullPointerException
 ### test, build and package
 ```
 mvn verify
-mvn hpi:run
+mvn hpi:run [-Dhost=0.0.0.0]
 mvn package
 ```
 Plugin **./target/Image_Tag_Parameter.hpi** can be installed on any jenkins instance

pom.xml

@@ -4,14 +4,14 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>3.50</version>
+        <version>4.43.1</version>
         <relativePath />
     </parent>
     <artifactId>image-tag-parameter</artifactId>
-    <version>1.11-SNAPSHOT</version>
+    <version>2.0-SNAPSHOT</version>
     <packaging>hpi</packaging>
     <properties>
-        <jenkins.version>2.164.3</jenkins.version>
+        <jenkins.version>2.346.1</jenkins.version>
         <java.level>8</java.level>
     </properties>
     <name>Image Tag Parameter Plugin</name>
@@ -51,12 +51,12 @@
         <dependency>
             <groupId>com.konghq</groupId>
             <artifactId>unirest-java</artifactId>
-            <version>3.11.11</version>
+            <version>3.13.6</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>credentials</artifactId>
-            <version>2.5</version>
+            <version>1139.veb_9579fca_33b_</version>
         </dependency>
     </dependencies>
 </project>

src/main/java/io/jenkins/plugins/luxair/ImageTag.java

@@ -27,12 +27,12 @@ private ImageTag() {
     }
 
     public static ResultContainer<List<String>> getTags(String image, String registry, String filter,
-                                                        String user, String password, Ordering ordering) {
+                                                        String user, String password, Ordering ordering, boolean verifySsl) {
         ResultContainer<List<String>> container = new ResultContainer<>(Collections.emptyList());
 
         String[] authService = getAuthService(registry);
         String token = getAuthToken(authService, image, user, password);
-        ResultContainer<List<VersionNumber>> tags = getImageTagsFromRegistry(image, registry, authService[0], token);
+        ResultContainer<List<VersionNumber>> tags = getImageTagsFromRegistry(image, registry, authService[0], token, verifySsl);
 
         if (tags.getErrorMsg().isPresent()) {
             container.setErrorMsg(tags.getErrorMsg().get());
@@ -172,12 +172,13 @@ private static String getAuthToken(String[] authService, String image, String us
     }
 
     private static ResultContainer<List<VersionNumber>> getImageTagsFromRegistry(String image, String registry,
-                                                                                 String authType, String token) {
+                                                                                 String authType, String token, boolean verifySsl) {
         ResultContainer<List<VersionNumber>> resultContainer = new ResultContainer<>(new ArrayList<>());
         String url = registry + "/v2/" + image + "/tags/list";
 
         Unirest.config().reset();
         Unirest.config().enableCookieManagement(false).interceptor(errorInterceptor);
+        Unirest.config().verifySsl(verifySsl);
         HttpResponse<JsonNode> response = Unirest.get(url)
             .header("Authorization", authType + " " + token)
             .asJson();

src/main/java/io/jenkins/plugins/luxair/ImageTagParameterConfiguration.java

@@ -29,6 +29,7 @@ public static ImageTagParameterConfiguration get() {
     private String defaultRegistry = DEFAULT_REGISTRY;
     private String defaultCredentialId = "";
     private Ordering defaultTagOrdering = Ordering.NATURAL;
+    private boolean defaultVerifySsl = true;
 
     public ImageTagParameterConfiguration() {
         load();

src/main/java/io/jenkins/plugins/luxair/ImageTagParameterDefinition.java

@@ -39,6 +39,7 @@ public class ImageTagParameterDefinition extends SimpleParameterDefinition {
     private String defaultTag;
     private Ordering tagOrder;
     private String errorMsg = "";
+    private boolean verifySsl = true;
 
     @DataBoundConstructor
     @SuppressWarnings("unused")
@@ -102,6 +103,16 @@ public void setErrorMsg(String errorMsg) {
         this.errorMsg = errorMsg;
     }
 
+    public boolean isVerifySsl() {
+		return verifySsl;
+	}
+
+    @DataBoundSetter
+    @SuppressWarnings("unused")    
+	public void setVerifySsl(boolean verifySsl) {
+		this.verifySsl = verifySsl;
+	}
+
     private String getDefaultOrEmptyCredentialId(String registry, String credentialId) {
         if (registry.equals(config.getDefaultRegistry()) && !StringUtil.isNotNullOrEmpty(credentialId)) {
             return config.getDefaultCredentialId();
@@ -123,7 +134,7 @@ public List<String> getTags() {
         }
 
         ResultContainer<List<String>> resultContainer = ImageTag
-            .getTags(image, registry, filter, user, password, getTagOrder());
+            .getTags(image, registry, filter, user, password, getTagOrder(), verifySsl);
         Optional<String> optionalErrorMsg = resultContainer.getErrorMsg();
         if (optionalErrorMsg.isPresent()) {
             setErrorMsg(optionalErrorMsg.get());

src/main/resources/io/jenkins/plugins/luxair/ImageTagParameterDefinition/config.jelly

@@ -34,6 +34,9 @@
         <f:entry title="${%Tag Ordering}" field="tagOrder">
             <f:enum default="${descriptor.getDefaultTagOrdering().name()}">${it}</f:enum>
         </f:entry>
-    </f:advanced>
+        <f:entry title="${%Verify SSL}" field="verifySsl">
+            <f:checkbox default="true" />
+        </f:entry>
+     </f:advanced>
 
 </j:jelly>

src/main/resources/io/jenkins/plugins/luxair/ImageTagParameterDefinition/help-verifySsl.html

@@ -0,0 +1,3 @@
+<div>
+    Specify if Certificate validation will be performed
+</div>