From 36595791d6c12071be991601d228fc9c9f5272b8 Mon Sep 17 00:00:00 2001
From: raylax <raylax@inurl.org>
Date: Fri, 7 Jun 2019 23:13:53 +0800
Subject: [PATCH] fix issues

---
 README.md                                     |  2 +-
 pom.xml                                       |  2 +-
 .../inurl/jenkins/plugin/OSSPublisher.java    | 28 +++++++++++++------
 src/main/resources/index.jelly                |  1 -
 .../inurl/jenkins/plugin/Messages.properties  |  3 +-
 .../jenkins/plugin/Messages_zh.properties     |  3 +-
 .../jenkins/plugin/OSSPublisher/config.jelly  |  8 ++++--
 7 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index d7a4c07..d526f77 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
 1.下载hpi文件
 
-[aliyun-oss-plugin.hpi](https://github.com/raylax/jenkins-aliyun-oss-uploader/releases/latest)
+[aliyun-oss-uploader.hpi](https://github.com/raylax/jenkins-aliyun-oss-uploader/releases/latest)
 
 2.在plugins管理页面上传hpi文件并安装，重启jenkins
 
diff --git a/pom.xml b/pom.xml
index 8b040df..e2f8b00 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
     <properties>
         <!-- Baseline Jenkins version you use to build the plugin. Users must have this version or newer to run. -->
         <jenkins.version>2.7.3</jenkins.version>
-        <java.level>7</java.level>
+        <java.level>8</java.level>
         <!-- Other properties you may want to use:
           ~ jenkins-test-harness.version: Jenkins Test Harness version you use to test the plugin. For Jenkins version >= 1.580.1 use JTH 2.0 or higher.
           ~ hpi-plugin.version: The HPI Maven Plugin version used by the plugin..
diff --git a/src/main/java/org/inurl/jenkins/plugin/OSSPublisher.java b/src/main/java/org/inurl/jenkins/plugin/OSSPublisher.java
index cefaceb..bf69b11 100644
--- a/src/main/java/org/inurl/jenkins/plugin/OSSPublisher.java
+++ b/src/main/java/org/inurl/jenkins/plugin/OSSPublisher.java
@@ -11,10 +11,10 @@ import hudson.tasks.BuildStepDescriptor;
 import hudson.tasks.BuildStepMonitor;
 import hudson.tasks.Publisher;
 import hudson.util.FormValidation;
+import hudson.util.Secret;
 import jenkins.tasks.SimpleBuildStep;
-import jnr.ffi.annotations.In;
 import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.math.NumberUtils;
+import org.jenkinsci.Symbol;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.QueryParameter;
 
@@ -30,7 +30,7 @@ public class OSSPublisher extends Publisher implements SimpleBuildStep {
 
     private final String accessKeyId;
 
-    private final String accessKeySecret;
+    private final Secret accessKeySecret;
 
     private final String bucketName;
 
@@ -50,7 +50,7 @@ public class OSSPublisher extends Publisher implements SimpleBuildStep {
     }
 
     public String getAccessKeySecret() {
-        return accessKeySecret;
+        return accessKeySecret.getPlainText();
     }
 
     public String getBucketName() {
@@ -73,7 +73,7 @@ public class OSSPublisher extends Publisher implements SimpleBuildStep {
     public OSSPublisher(String endpoint, String accessKeyId, String accessKeySecret, String bucketName, String localPath, String remotePath, String maxRetries) {
         this.endpoint = endpoint;
         this.accessKeyId = accessKeyId;
-        this.accessKeySecret = accessKeySecret;
+        this.accessKeySecret = Secret.fromString(accessKeySecret);
         this.bucketName = bucketName;
         this.localPath = localPath;
         this.remotePath = remotePath;
@@ -88,7 +88,7 @@ public class OSSPublisher extends Publisher implements SimpleBuildStep {
     @Override
     public void perform(@Nonnull Run<?, ?> run, @Nonnull FilePath workspace, @Nonnull Launcher launcher, @Nonnull TaskListener listener) throws InterruptedException, IOException {
         PrintStream logger = listener.getLogger();
-        OSSClient client = new OSSClient(endpoint, accessKeyId, accessKeySecret);
+        OSSClient client = new OSSClient(endpoint, accessKeyId, accessKeySecret.getPlainText());
         String local = localPath.substring(1);
         String remote = remotePath.substring(1);
         FilePath p = new FilePath(workspace, local);
@@ -115,6 +115,10 @@ public class OSSPublisher extends Publisher implements SimpleBuildStep {
     }
 
     private void uploadFile(OSSClient client, PrintStream logger, String key, FilePath path) throws InterruptedException, IOException {
+        if (!path.exists()) {
+            logger.println("file [" + path.getRemote() + "] not exists, skipped");
+            return;
+        }
         int maxRetries = getMaxRetries();
         int retries = 0;
         do {
@@ -143,6 +147,7 @@ public class OSSPublisher extends Publisher implements SimpleBuildStep {
         client.putObject(bucketName, realKey, inputStream);
     }
 
+    @Symbol("aliyunOSSUpload")
     @Extension
     public static final class DescriptorImpl extends BuildStepDescriptor<Publisher> {
 
@@ -173,11 +178,18 @@ public class OSSPublisher extends Publisher implements SimpleBuildStep {
         }
 
         public FormValidation doCheckLocalPath(@QueryParameter(required = true) String value) {
-            return checkValue(value, Messages.OSSPublish_MissingLocalPath());
+            return checkBeginWithSlash(value);
         }
 
         public FormValidation doCheckRemotePath(@QueryParameter(required = true) String value) {
-            return checkValue(value, Messages.OSSPublish_MissingRemotePath());
+            return checkBeginWithSlash(value);
+        }
+
+        private FormValidation checkBeginWithSlash(String value) {
+            if (!value.startsWith("/")) {
+                return FormValidation.error(Messages.OSSPublish_MustBeginWithSlash());
+            }
+            return FormValidation.ok();
         }
 
         private FormValidation checkValue(String value, String message) {
diff --git a/src/main/resources/index.jelly b/src/main/resources/index.jelly
index 35f37a7..4fd1185 100644
--- a/src/main/resources/index.jelly
+++ b/src/main/resources/index.jelly
@@ -1,4 +1,3 @@
 <?jelly escape-by-default='true'?>
 <div>
-    TODO
 </div>
diff --git a/src/main/resources/org/inurl/jenkins/plugin/Messages.properties b/src/main/resources/org/inurl/jenkins/plugin/Messages.properties
index 09d0f31..837c5e4 100644
--- a/src/main/resources/org/inurl/jenkins/plugin/Messages.properties
+++ b/src/main/resources/org/inurl/jenkins/plugin/Messages.properties
@@ -6,4 +6,5 @@ OSSPublish.MissingAccessKeySecret=Please set AccessKeySecret
 OSSPublish.MissingBucketName=Please set BucketName
 OSSPublish.MissingLocalPath=Please set LocalPath
 OSSPublish.MissingRemotePath=Please set RemotePath
-OSSPublish.MaxRetiesMustBeNumbers=Must be number
\ No newline at end of file
+OSSPublish.MaxRetiesMustBeNumbers=Must be number
+OSSPublish.MustBeginWithSlash=Must begin with `/`
\ No newline at end of file
diff --git a/src/main/resources/org/inurl/jenkins/plugin/Messages_zh.properties b/src/main/resources/org/inurl/jenkins/plugin/Messages_zh.properties
index b5df8f6..1a97b99 100644
--- a/src/main/resources/org/inurl/jenkins/plugin/Messages_zh.properties
+++ b/src/main/resources/org/inurl/jenkins/plugin/Messages_zh.properties
@@ -6,4 +6,5 @@ OSSPublish.MissingAccessKeySecret=\u8bf7\u8bbe\u7f6eAccessKeySecret
 OSSPublish.MissingBucketName=\u8bf7\u8bbe\u7f6eBucketName
 OSSPublish.MissingLocalPath=\u8bf7\u8bbe\u7f6e\u672c\u5730\u8def\u5f84
 OSSPublish.MissingRemotePath=\u8bf7\u8bbe\u7f6e\u8fdc\u7a0b\u8def\u5f84
-OSSPublish.MaxRetiesMustBeNumbers=\u6700\u5927\u91cd\u8bd5\u6b21\u6570\u5fc5\u987b\u4e3a\u6570\u5b57
\ No newline at end of file
+OSSPublish.MaxRetiesMustBeNumbers=\u6700\u5927\u91cd\u8bd5\u6b21\u6570\u5fc5\u987b\u4e3a\u6570\u5b57
+OSSPublish.MustBeginWithSlash=\u5fc5\u987b\u4ee5`/`\u5f00\u5934
\ No newline at end of file
diff --git a/src/main/resources/org/inurl/jenkins/plugin/OSSPublisher/config.jelly b/src/main/resources/org/inurl/jenkins/plugin/OSSPublisher/config.jelly
index b439156..8f9b5ee 100644
--- a/src/main/resources/org/inurl/jenkins/plugin/OSSPublisher/config.jelly
+++ b/src/main/resources/org/inurl/jenkins/plugin/OSSPublisher/config.jelly
@@ -1,5 +1,9 @@
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
+<j:jelly xmlns:j="jelly:core"
+         xmlns:st="jelly:stapler"
+         xmlns:d="jelly:define"
+         xmlns:l="/lib/layout"
+         xmlns:t="/lib/hudson" xmlns:f="/lib/form">
     <f:entry title="${%Endpoint}" field="endpoint">
         <f:textbox />
     </f:entry>
@@ -7,7 +11,7 @@
         <f:textbox />
     </f:entry>
     <f:entry title="${%AccessKeySecret}" field="accessKeySecret">
-        <f:textbox />
+        <f:password/>
     </f:entry>
     <f:entry title="${%BucketName}" field="bucketName">
         <f:textbox />
-- 
GitLab