Merge branch 'master' of https://github.com/vmware/harbor into uitest

src/ui/proxy/interceptor_test.go

@@ -204,8 +204,8 @@ func TestCopyResp(t *testing.T) {
 
 func TestMarshalError(t *testing.T) {
 	assert := assert.New(t)
-	js := marshalError("Not Found", 404)
-	assert.Equal("{\"code\":404,\"message\":\"Not Found\",\"details\":\"Not Found\"}", js)
+	js := marshalError("Not Found")
+	assert.Equal("{\"errors\":[{\"code\":\"PROJECT_POLICY_VIOLATION\",\"message\":\"Not Found\",\"detail\":\"Not Found\"}]}", js)
 }
 
 func TestIsDigest(t *testing.T) {

src/ui/proxy/interceptors.go

@@ -140,20 +140,20 @@ func (uh urlHandler) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
 	if flag {
 		components := strings.SplitN(repository, "/", 2)
 		if len(components) < 2 {
-			http.Error(rw, marshalError(fmt.Sprintf("Bad repository name: %s", repository), http.StatusInternalServerError), http.StatusBadRequest)
+			http.Error(rw, marshalError(fmt.Sprintf("Bad repository name: %s", repository)), http.StatusBadRequest)
 			return
 		}
 
 		client, err := uiutils.NewRepositoryClientForUI(tokenUsername, repository)
 		if err != nil {
 			log.Errorf("Error creating repository Client: %v", err)
-			http.Error(rw, marshalError(fmt.Sprintf("Failed due to internal Error: %v", err), http.StatusInternalServerError), http.StatusInternalServerError)
+			http.Error(rw, marshalError(fmt.Sprintf("Failed due to internal Error: %v", err)), http.StatusInternalServerError)
 			return
 		}
 		digest, _, err := client.ManifestExist(reference)
 		if err != nil {
 			log.Errorf("Failed to get digest for reference: %s, error: %v", reference, err)
-			http.Error(rw, marshalError(fmt.Sprintf("Failed due to internal Error: %v", err), http.StatusInternalServerError), http.StatusInternalServerError)
+			http.Error(rw, marshalError(fmt.Sprintf("Failed due to internal Error: %v", err)), http.StatusInternalServerError)
 			return
 		}
 
@@ -244,12 +244,12 @@ func (cth contentTrustHandler) ServeHTTP(rw http.ResponseWriter, req *http.Reque
 	}
 	match, err := matchNotaryDigest(img)
 	if err != nil {
-		http.Error(rw, marshalError("Failed in communication with Notary please check the log", http.StatusInternalServerError), http.StatusInternalServerError)
+		http.Error(rw, marshalError("Failed in communication with Notary please check the log"), http.StatusInternalServerError)
 		return
 	}
 	if !match {
 		log.Debugf("digest mismatch, failing the response.")
-		http.Error(rw, marshalError("The image is not signed in Notary.", http.StatusPreconditionFailed), http.StatusPreconditionFailed)
+		http.Error(rw, marshalError("The image is not signed in Notary."), http.StatusPreconditionFailed)
 		return
 	}
 	cth.next.ServeHTTP(rw, req)
@@ -278,19 +278,19 @@ func (vh vulnerableHandler) ServeHTTP(rw http.ResponseWriter, req *http.Request)
 	overview, err := dao.GetImgScanOverview(img.digest)
 	if err != nil {
 		log.Errorf("failed to get ImgScanOverview with repo: %s, reference: %s, digest: %s. Error: %v", img.repository, img.reference, img.digest, err)
-		http.Error(rw, marshalError("Failed to get ImgScanOverview.", http.StatusPreconditionFailed), http.StatusPreconditionFailed)
+		http.Error(rw, marshalError("Failed to get ImgScanOverview."), http.StatusPreconditionFailed)
 		return
 	}
-	if overview == nil {
+	// severity is 0 means that the image fails to scan or not scanned successfully.
+	if overview == nil || overview.Sev == 0 {
 		log.Debugf("cannot get the image scan overview info, failing the response.")
-		http.Error(rw, marshalError("Cannot get the image scan overview info.", http.StatusPreconditionFailed), http.StatusPreconditionFailed)
+		http.Error(rw, marshalError("Cannot get the image severity."), http.StatusPreconditionFailed)
 		return
 	}
 	imageSev := overview.Sev
 	if imageSev >= int(projectVulnerableSeverity) {
 		log.Debugf("the image severity: %q is higher then project setting: %q, failing the response.", models.Severity(imageSev), projectVulnerableSeverity)
-		http.Error(rw, marshalError(fmt.Sprintf("The severity of vulnerability of the image: %q is equal or higher than the threshold in project setting: %q.", models.Severity(imageSev), projectVulnerableSeverity),
-			http.StatusPreconditionFailed), http.StatusPreconditionFailed)
+		http.Error(rw, marshalError(fmt.Sprintf("The severity of vulnerability of the image: %q is equal or higher than the threshold in project setting: %q.", models.Severity(imageSev), projectVulnerableSeverity)), http.StatusPreconditionFailed)
 		return
 	}
 	vh.next.ServeHTTP(rw, req)
@@ -340,13 +340,17 @@ func copyResp(rec *httptest.ResponseRecorder, rw http.ResponseWriter) {
 	rw.Write(rec.Body.Bytes())
 }
 
-func marshalError(msg string, statusCode int) string {
-	je := &JSONError{
-		Message: msg,
-		Code:    statusCode,
-		Details: msg,
+func marshalError(msg string) string {
+	var tmpErrs struct {
+		Errors []JSONError `json:"errors,omitempty"`
 	}
-	str, err := json.Marshal(je)
+	tmpErrs.Errors = append(tmpErrs.Errors, JSONError{
+		Code:    "PROJECT_POLICY_VIOLATION",
+		Message: msg,
+		Detail:  msg,
+	})
+
+	str, err := json.Marshal(tmpErrs)
 	if err != nil {
 		log.Debugf("failed to marshal json error, %v", err)
 		return msg
@@ -356,7 +360,7 @@ func marshalError(msg string, statusCode int) string {
 
 // JSONError wraps a concrete Code and Message, it's readable for docker deamon.
 type JSONError struct {
-	Code    int    `json:"code,omitempty"`
+	Code    string `json:"code,omitempty"`
 	Message string `json:"message,omitempty"`
-	Details string `json:"details,omitempty"`
+	Detail  string `json:"detail,omitempty"`
 }

tests/integration.sh

@@ -75,7 +75,7 @@ echo $rc
 
 timestamp=$(date +%s)
 outfile="integration_logs_"$DRONE_BUILD_NUMBER"_"$DRONE_COMMIT".zip"
-zip -9 $outfile output.xml log.html *.png package.list *container-logs.zip *.log /var/log/harbor/*/*.log /data/config/*
+zip -9 $outfile output.xml log.html *.png package.list *container-logs.zip *.log /var/log/harbor/*/*.log /data/config/* /data/job_logs/*
 if [ -f "$outfile" ]; then
   gsutil cp $outfile gs://harbor-ci-logs
   echo "----------------------------------------------"

tests/resources/Harbor-Pages/Replication.robot

@@ -36,7 +36,7 @@ Create An New Rule With New Endpoint
     Input text  xpath=${destination_username_xpath}  ${destination_username}
     Input text  xpath=${destination_password_xpath}  ${destination_password}
     Click element  xpath=${replicaton_save_xpath}
-    Sleep  2
+    Sleep  5
 	Capture Page Screenshot  rule_${policy_name}.png
 	Wait Until Page Contains  ${policy_name}
 	Wait Until Page Contains  ${policy_description}