Commit Graph

10918 Commits

Author SHA1 Message Date
He Weiwei
4ec1d07c6f
Remove old version scan reports of trivy (#16262)
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2022-01-25 11:10:04 +08:00
stonezdj(Daojun Zhang)
210921cd81
Merge pull request #16268 from stonezdj/2.4_duplicate_ldap_groupname
(cherry-pick) Group members lose access to push or see projects on Harbor
2022-01-25 10:16:34 +08:00
stonezdj
234bb0e35e Group members lose access to push or see projects on Harbor
Handle the case if there is duplicate user group name when onboard ldap user group
   Continue to attach groups when it fail on one item
   Fixes #16220

Signed-off-by: stonezdj <stonezdj@gmail.com>
2022-01-24 13:22:01 +08:00
Shengwen YU
7d39146bcd
Merge pull request #16258 from zyyw/release-2.4.0
(cherry-pick) feat: bump TRIVYVERSION to v0.22.0 and bump TRIVYADAPTERVERSION to v0.25.0
2022-01-21 18:22:32 +08:00
Shengwen Yu
c9ad611fce feat: bump TRIVYVERSION to v0.22.0 and bump TRIVYADAPTERVERSION to v0.25.0
Signed-off-by: Shengwen Yu <yshengwen@vmware.com>
2022-01-21 17:05:02 +08:00
Yang Jiao
259b1248c3
Merge pull request #16212 from YangJiao0817/specify-pgsqlversion13-2.4
[cherry-pick]Specify postgresql version to 13
2022-01-14 17:47:30 +08:00
Yang Jiao
63dc0eefc2 Specify postgresql version to 13
Signed-off-by: Yang Jiao <jiaoya@vmware.com>
2022-01-14 16:22:47 +08:00
Yang Jiao
c4b06d7959
Merge pull request #16091 from AllForNothing/release-2.4.0
Fix unescaped url issue
2021-12-16 12:00:44 +08:00
AllForNothing
644413af28 Fix unescaped url issue
Signed-off-by: AllForNothing <sshijun@vmware.com>
2021-12-16 11:10:18 +08:00
Wang Yan
2e6650a9f1
add pull update control env (#16063)
These variables are temporary solution for issue: https://github.com/goharbor/harbor/issues/16039
When user disable the pull count/time/audit log, it will decrease the database access, especially in large concurrency pull scenarios.

1, PULL_TIME_UPDATE_DISABLE : The flag to indicate if pull time is disable for pull request.
2, PULL_COUNT_UPDATE_DISABLE : The flag to indicate if pull count is disable for pull request.
3, pull audit log will not create on disabling pull time.

Signed-off-by: Wang Yan <wangyan@vmware.com>
2021-12-16 11:03:53 +08:00
Yang Jiao
678d579a96
Merge pull request #16118 from YangJiao0817/dump-version-to-2.4.1
Bump up version to 2.4.1
2021-12-15 16:11:45 +08:00
He Weiwei
0ff5dddd0b
add scan report v1.1 to default X-Accept-Vulnerabilities (#16119)
Closes #16085

Signed-off-by: He Weiwei <hweiwei@vmware.com>
2021-12-15 16:08:23 +08:00
Yang Jiao
511c7ec784 Bump up version to 2.4.1
Signed-off-by: Yang Jiao <jiaoya@vmware.com>
2021-12-15 15:02:04 +08:00
Chenyu Zhang
d406cb47f7
Merge pull request #16127 from chlins/cp-2.4/codeql-log-injection
(CHERRY-PICK) fix: resolve the codeql alerts
2021-12-15 14:58:05 +08:00
chlins
2c6845d0b4 fix: resolve the codeql alerts
Signed-off-by: chlins <chenyuzh@vmware.com>
2021-12-15 13:51:48 +08:00
Yang Jiao
c74305a823
Merge pull request #16109 from YangJiao0817/refresh-base-2.4-1210
Refresh base image
2021-12-10 15:23:41 +08:00
Yang Jiao
8af8c2ce81 Refresh base image
Signed-off-by: Yang Jiao <jiaoya@vmware.com>
2021-12-10 14:35:44 +08:00
Qian Deng
a5a94f248e
Merge pull request #16106 from ninjadq/release-2.4.0
Fix: using traditional `PKCS#1` format RSA key
2021-12-10 14:15:44 +08:00
Qian Deng
08595db2eb Fix: using traditional PKCS#1 format RSA key
The openssl 3.0.0 using newer `PKCS#8` format.
But it's not compatitable with harbor core
So using tradictional format instead

Signed-off-by: Qian Deng <dengq@vmware.com>
2021-12-10 00:20:44 +08:00
stonezdj(Daojun Zhang)
0395369212
Merge pull request #16016 from stonezdj/2.4.0_cache_config
(cherry-pick) Enable db config cache explicitly
2021-11-17 15:39:56 +08:00
stonezdj
162381de56 Enable db config cache explicitly
previous config is not cached because it is initialized when cache is not ready

Signed-off-by: stonezdj <stonezdj@gmail.com>
2021-11-17 14:14:59 +08:00
Yang Jiao
b95b3fd84b
Merge pull request #15948 from YangJiao0817/include-test-case-e2e-image-2.4
[Cherry-pick]Add e2e image include test case in 2.4
2021-11-05 17:53:33 +08:00
Yang Jiao
9eb77f0af1 Add e2e image include test case
Signed-off-by: Yang Jiao <jiaoya@vmware.com>
2021-11-04 15:03:37 +08:00
孙世军
b881f1b020
Add pagination for user groups (#15933)
Signed-off-by: AllForNothing <sshijun@vmware.com>
2021-11-03 14:29:41 +08:00
Yang Jiao
d4affc2eba
Merge pull request #15873 from heww/cherry-pick-pr-15872
[Cherry pick]chore: bump up trivy adapter to v0.24.0
2021-10-25 18:45:26 +08:00
He Weiwei
f34550ade1 chore: bump up trivy adapter to v0.24.0
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2021-10-25 09:42:35 +00:00
Wang Yan
3db6f6b0d6
bump up go to v1.17 (#15868)
Signed-off-by: Wang Yan <wangyan@vmware.com>
2021-10-25 17:21:38 +08:00
孙世军
81dd6345ca
Enlarge index artifact folder icon (#15863)
Signed-off-by: AllForNothing <sshijun@vmware.com>
2021-10-25 14:09:31 +08:00
He Weiwei
89d52ba7f4
feat: bump up trivy adater to v0.23.0 (#15861)
Closes #14983

Signed-off-by: He Weiwei <hweiwei@vmware.com>
2021-10-25 12:44:54 +08:00
stonezdj(Daojun Zhang)
469333c97d
Merge pull request #15847 from stonezdj/2.4_add_hostname_to_tracespan_name
(cherry-pick) Add hostname to trace span name
2021-10-23 20:43:04 +08:00
stonezdj
174d3d6f6d Add hostname to trace span name
Fixes #15726, unify the trace span name in all components

Signed-off-by: stonezdj <stonezdj@gmail.com>
2021-10-23 18:13:31 +08:00
孙世军
3c4264270e
Add XAcceptVulnerabilities header when getting artifact scan overview (#15852)
Signed-off-by: AllForNothing <sshijun@vmware.com>
2021-10-22 17:12:26 +08:00
He Weiwei
16ac5d922f
Add configurable timeout for Trivy scans (#15796) (#15849)
Signed-off-by: Rolf Ahrenberg <Rolf.Ahrenberg@saunalahti.fi>

Co-authored-by: Rolf Ahrenberg <Rolf.Ahrenberg@saunalahti.fi>
2021-10-22 16:49:49 +08:00
Steven Zou
283b7f1023
Merge pull request #15851 from heww/cherry-pick-pr-15747
[Cherry pick]fix(scan): Add function to avoid writing creds in jobservice logs, sw…
2021-10-22 16:42:30 +08:00
Alexis L
59fed27185 fix(scan): Add function to avoid writing creds in jobservice logs, switch to debug instead of info (#15747)
Signed-off-by: Alexis <60alexis@gmail.com>
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2021-10-22 07:30:59 +00:00
Chenyu Zhang
0299976059
fix: handle codeql golang security issues (#15848)
Signed-off-by: chlins <chenyuzh@vmware.com>

Co-authored-by: chlins <chenyuzh@vmware.com>
2021-10-22 14:36:50 +08:00
stonezdj(Daojun Zhang)
c9e8e757eb
Update the jaeger settings in harbor.yaml.tmpl (#15846)
agent default port to 6831

Signed-off-by: stonezdj <stonezdj@gmail.com>
2021-10-22 13:43:58 +08:00
孙世军
87eead32d2
Fix css issues for robot and replication (#15835)
Signed-off-by: AllForNothing <sshijun@vmware.com>
2021-10-22 10:09:34 +08:00
stonezdj(Daojun Zhang)
46821a81f4
Merge pull request #15831 from stonezdj/2.4_remove_noise
(cherry-pick) Fix all issues related to the noise in the logs
2021-10-21 20:22:21 +08:00
stonezdj
a9d574428f Fix all issues related to the noise in the logs
Change log level to debug when required
Signed-off-by: stonezdj <stonezdj@gmail.com>

(cherry picked from commit a00a83df38)
2021-10-21 09:40:16 +08:00
Yang Jiao
a4f8feba0c
Merge pull request #15813 from YangJiao0817/refresh-base-image-2.4-1
Refresh base image
2021-10-19 10:48:19 +08:00
Yang Jiao
64ea45fa16 Refresh base image
Signed-off-by: Yang Jiao <jiaoya@vmware.com>
2021-10-19 09:44:31 +08:00
Wang Yan
6014646bcb
fixes gc dry run issue (#15804)
fixes #15332, for the dry run mode, gc job should not remove the untagged candidates.
To fix it, use the simulate untagged artifact deletion for dry-run.

Signed-off-by: Wang Yan <wangyan@vmware.com>
2021-10-19 07:42:54 +08:00
Shengwen YU
3f75f0db32
feat: add python testing script for stop scan job (#15779)
Signed-off-by: Shengwen Yu <yshengwen@vmware.com>

Co-authored-by: Shengwen Yu <yshengwen@vmware.com>
2021-10-18 13:13:53 +08:00
Steven Zou
22e99c78d1
Merge pull request #15777 from AllForNothing/remove-neg
Remove negligible and unknown severities and add none severity
2021-10-18 11:46:20 +08:00
stonezdj(Daojun Zhang)
2020bf383b
Merge pull request #15790 from stonezdj/21oct15_change_trace_name
Change the span name to <method>_<request uri>
2021-10-18 09:41:12 +08:00
Yurii Paneiko
be1e762b70
For some reason this script hangs on bzip2 presence checking (#15647)
Steps to reproduce:

Clone repo from master branch
Run: make install COMPILETAG=compile_golangimage
Wait until script will check that bzip2 is installed

Signed-off-by: YuriiPaneiko <yurapaneyko@gmail.com>
2021-10-14 20:11:14 +08:00
Shatakshi Gupta
76733d72be
fixed S1008 bugbash error (#15781)
Signed-off-by: Shatakshi <shatakshi.gupta85@gmail.com>
2021-10-14 20:10:48 +08:00
Soumik Majumder
eb7329a471
Fix semgrep sprintf-host-port (#15782)
Signed-off-by: Soumik Majumder <soumikm@vmware.com>
2021-10-14 20:10:27 +08:00
Soumik Majumder
b4c2ff7768
Fix bad and missing shebangs (#15783)
Signed-off-by: Soumik Majumder <soumikm@vmware.com>
2021-10-14 20:09:41 +08:00