Merge branch 'main' into robot-sys-issue

.github/workflows/CI.yml

@@ -317,7 +317,7 @@ jobs:
       - ubuntu-latest
     timeout-minutes: 100
     steps:
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: '18'
       - uses: actions/checkout@v3

src/go.mod

@@ -21,12 +21,12 @@ require (
 	github.com/go-asn1-ber/asn1-ber v1.5.1
 	github.com/go-ldap/ldap/v3 v3.2.4
 	github.com/go-openapi/errors v0.19.6
-	github.com/go-openapi/loads v0.19.5
+	github.com/go-openapi/loads v0.19.5 // indirect
 	github.com/go-openapi/runtime v0.19.20
-	github.com/go-openapi/spec v0.19.8
+	github.com/go-openapi/spec v0.19.8 // indirect
 	github.com/go-openapi/strfmt v0.19.5
 	github.com/go-openapi/swag v0.19.14
-	github.com/go-openapi/validate v0.19.10
+	github.com/go-openapi/validate v0.19.10 // indirect
 	github.com/go-redis/redis/v8 v8.11.4
 	github.com/gocarina/gocsv v0.0.0-20210516172204-ca9e8a8ddea8
 	github.com/gocraft/work v0.5.1
@@ -66,7 +66,7 @@ require (
 	golang.org/x/oauth2 v0.5.0
 	golang.org/x/sync v0.3.0
 	golang.org/x/text v0.13.0
-	golang.org/x/time v0.0.0-20220210224613-90d013bbcef8
+	golang.org/x/time v0.4.0
 	gopkg.in/h2non/gock.v1 v1.0.16
 	gopkg.in/yaml.v2 v2.4.0
 	helm.sh/helm/v3 v3.11.3

src/go.sum

@@ -1047,8 +1047,8 @@ golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
 golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 h1:vVKdlvoWBphwdxWKrFZEuM0kGgGLxUOYcY4U/2Vjg44=
-golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.4.0 h1:Z81tqI5ddIoXDPvVQ7/7CC9TnLM7ubaFG2qXYd5BbYY=
+golang.org/x/time v0.4.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

tests/resources/Harbor-Pages/Project-Config.robot

@@ -18,6 +18,10 @@ Click Cosign Deployment Security
     Mouse Down  //input[@id='content-trust-cosign']
     Mouse Up  //input[@id='content-trust-cosign']
 
+Click Notation Deployment Security
+    Mouse Down  //input[@id='content-trust']
+    Mouse Up  //input[@id='content-trust']
+
 Click Prevent Running
     Mouse Down  //hbr-project-policy-config//input[@name='prevent-vulnerability-image']
     Mouse Up  //hbr-project-policy-config//input[@name='prevent-vulnerability-image']
@@ -45,6 +49,9 @@ Project Should Be Public
 Content Cosign Deployment security Be Selected
     Checkbox Should Be Selected  //input[@id='content-trust-cosign']
 
+Content Notation Deployment security Be Selected
+    Checkbox Should Be Selected  //input[@id='content-trust']
+
 Prevent Running Should Be Selected
     Checkbox Should Be Selected  //hbr-project-policy-config//input[@name='prevent-vulnerability-image']
 

tests/robot-cases/Group1-Nightly/Common.robot

@@ -794,6 +794,35 @@ Test Case - Cosign And Cosign Deployment Security Policy
     Retry Double Keywords When Error  Delete Accessory  ${tag}  Should be Accessory deleted  ${tag}
     Close Browser
 
+Test Case - Notation And Notation Deployment Security Policy
+    [Tags]  notation
+    Init Chrome Driver
+    ${user}=  Set Variable  user007
+    ${pwd}=  Set Variable  Test1@34
+    ${d}=  Get Current Date  result_format=%m%s
+    ${image}=  Set Variable  hello-world
+    ${tag}=  Set Variable  latest
+    Sign In Harbor  ${HARBOR_URL}  ${user}  ${pwd}
+    Create An New Project And Go Into Project  project${d}
+    Goto Project Config
+    Click Notation Deployment Security
+    Save Project Config
+    Content Notation Deployment security Be Selected
+
+    Push Image With Tag  ${ip}  ${user}  ${pwd}  project${d}  ${image}  ${tag}
+    Go Into Project  project${d}
+    Go Into Repo  project${d}  ${image}
+    Should Not Be Signed  ${tag}
+    Cannot Pull Image  ${ip}  ${user}  ${pwd}  project${d}  ${image}:${tag}  err_msg=The image is not signed by notation.
+
+    Notation Generate Cert
+    Notation Sign  ${ip}/project${d}/${image}:${tag}
+
+    Retry Double Keywords When Error  Retry Element Click  ${artifact_list_refresh_btn}  Should Be Signed  ${tag}
+    Pull image  ${ip}  ${user}  ${pwd}  project${d}  ${image}:${tag}
+    Retry Double Keywords When Error  Delete Accessory  ${tag}  Should be Accessory deleted  ${tag}
+    Close Browser
+
 Test Case - Audit Log And Purge
     [Tags]  audit_log_and_purge
     Init Chrome Driver