Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-17 07:45:24 +01:00
Code Issues Projects Releases Wiki Activity
10,353 Commits 49 Branches 315 Tags 351 MiB
ef72c76e0e
Commit Graph

10353 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Jiang
ef72c76e0e Add "*" to the claim set in the token for /v2 apis 
The "*" is used by notary server for permission checking:
84287fd8df/server/server.go (L200)
Hence, we need to add this into the JWT token such that actions like key
rotation can be executed.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2021-03-02 19:36:04 +08:00
Will Sun
3ecd60b84b
Add harbor datetime pipe (#14331) 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2021-03-01 15:45:21 +08:00
He Weiwei
9161a3fbdf
refactor: use ormer from the ctx for scanner ctl mgr and dao (#14313) 
Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2021-03-01 12:02:40 +08:00
Daniel Jiang
2fcdf3e09b
Merge pull request #14308 from reasonerjt/nginx-forward-proto-conf 
Refine the way to set X-Forwarded-Proto in nginx
 2021-03-01 01:31:00 +08:00
Wenkai Yin(尹文开)
43a7fad93c
Merge pull request #14319 from wy65701436/fix-blob-sorting 
add sorting for list blobs
 2021-02-26 14:13:36 +08:00
Wang Yan
5c2d43ea38 add sorting for list blobs 
Signed-off-by: Wang Yan <wangyan@vmware.com>
 2021-02-26 11:52:56 +08:00
Wenkai Yin(尹文开)
fba6dd799e
Merge pull request #14300 from heww/quota-apis 
refactor: generate quota APIs by go-swagger
 2021-02-26 10:49:52 +08:00
Daniel Jiang
387be3686a Refine the way to set X-Forwarded-Proto in nginx 
Refine the way to set the header so user won't need to comment it if
Harbor is sitting behind a reverse proxy.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2021-02-25 17:43:55 +08:00
He Weiwei
4b033c266a refactor: generate quota APIs by go-swagger 
Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2021-02-25 08:19:55 +00:00
Will Sun
1955b57701
Remove forced ng-check for registries component (#14302) 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2021-02-25 15:35:30 +08:00
Daniel Jiang
a4a995327b
Merge pull request #14129 from piotrekfilip/Add-support-for-http-proxy-in-oidc-insecureTransport 
Add support for http proxy in oidc insecureTransport
 2021-02-24 18:51:30 +08:00
danfengliu
37efb6fb42
Merge pull request #14122 from danfengliu/upgrade-docker-and-containerd 
Add ui-test for OIDC group user and upgrade docker and containerd for e2e image
 2021-02-24 17:40:32 +08:00
Wang Yan
0bd68de7d6
bump up to v2.3.0 (#14288) 
Signed-off-by: Wang Yan <wangyan@vmware.com>
 2021-02-24 16:10:25 +08:00
danfengliu
7fb9dbd0fa Upgrade docker and containerd 
1. Fix E2E quotas issue, push the same image but with different name;
2. Add checkpoint for robot account test;
3. Upgraded docker and containerd in E2E image;
4. Package base image sample(busybox) into E2E image, so in E2E
container, all local docker images can be cleaned up, once base image is needed for
building image, it can be loaded locally;
5. Adapt OIDC service of supporting LDAP user, and add OIDC group user
test;
6. Restart docker deamon before content trust test, both in API and UI
test;
7. Add retry for keyword "Add A Tag Immutability Rule";
8. Fix tag retention test issue, missing click angle icon, and enhance
checkpoint of dry run and real run;
9. Fix schedule test issue for wrong cron string;
10. Disable quotas verification, it's not stable for script defect;

Signed-off-by: danfengliu <danfengl@vmware.com>
 2021-02-24 15:43:11 +08:00
Wang Yan
abfc52e0ea
enlarge the CI timeout to 100 minutes (#14290) 
Signed-off-by: Wang Yan <wangyan@vmware.com>
 2021-02-23 20:51:36 +08:00
He Weiwei
7cfd372af2
fix: use clone query in loop of artifact.Iterator func (#14283) 
Closes #14251

Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2021-02-23 12:23:36 +08:00
danfengliu
9e3f0de12c
Merge pull request #14124 from danfengliu/reschedule-docker-login-policy-in-build-base-image-in-master 
Reschedule docker login policy in base image build process
 2021-02-23 10:10:59 +08:00
Will Sun
84f672bef5
Fix nightly failure for p2p case (#14261) 
Signed-off-by: sshijun <sshijun@vmware.com>
 2021-02-23 09:56:01 +08:00
Will Sun
617ebb4045
Fix redirection issue for registries (#14270) 
Signed-off-by: sshijun <sshijun@vmware.com>
 2021-02-22 10:59:42 +08:00
danfengliu
7d05c8e513 Reschedule docker login policy in base image build process 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2021-02-22 10:05:25 +08:00
Josh Soref
dfe360040b Spelling 
* addition
* attribute
* auditing
* availability
* available
* bandwidth
* browser
* business
* cadence
* chartmuseum
* client
* column
* content
* demonstrate
* described
* endpoints
* facilitate
* github
* harbor
* information
* instance
* manual
* meaningful
* operation
* overridden
* password
* possible
* project
* refactor
* replication
* requires
* running
* scanned
* settings
* signup
* those
* unsigned
* vulnerability

--
Also removes trailing space from a filename

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
 2021-02-19 11:59:15 +08:00
Will Sun
74b6bfe731
Modify cron regex for UI (#14254) 
Signed-off-by: sshijun <sshijun@vmware.com>
 2021-02-18 15:09:10 +08:00
Daniel Pacak
202342cf0c
chore: Bump up Trivy scanner adapter from v0.17.0 to v0.18.0 (#14240) 
Trivy adapter version v0.18.0 ships with Trivy v0.16.0.
It also changes the way we return links to upstream
vulnerability references. Instead of returning multiple
URLs Trivy returns the primary URL to Aqua Vulnerability
Database (e.g. https://avd.aquasec.com/nvd/cve-2020-10688/)
with up to date status and remediation guide.

Signed-off-by: Daniel Pacak <pacak.daniel@gmail.com>
 2021-02-18 14:40:07 +08:00
Will Sun
2d84b62fe2
Refactor UI routing and remove redundant code (#14166) 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2021-02-18 09:12:23 +08:00
Daniel Jiang
51c8375425
Merge pull request #14220 from wy65701436/fix-codeql-quota 
fix quota dao sql injection
 2021-02-10 10:34:54 +08:00
Wenkai Yin(尹文开)
76c493b67d
Merge pull request #14208 from ywk253100/210208_sql 
Fix sql issue for querying tasks
 2021-02-10 10:07:56 +08:00
Wang Yan
496a178eb3 fix quota dao sql injection 
Signed-off-by: Wang Yan <wangyan@vmware.com>
 2021-02-10 03:55:59 +08:00
Wenkai Yin
fe0216ce94 Fix sql issue for querying tasks 
Fix sql issue for querying tasks

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2021-02-09 22:15:06 +08:00
Wang Yan
21d35f9702
update blob list query (#14195) 
* update blob list query

Deprecate blob list parameters, and use the query for instead.

Signed-off-by: wang yan <wangyan@vmware.com>

* update per review comments

Signed-off-by: Wang Yan <wangyan@vmware.com>
 2021-02-09 17:08:26 +08:00
Daniel Jiang
7231679373
Use the Email address from DB instead of request (#14212) 
This commit updates the controller for sending reset pwd Email,
to make it use the Email from DB query result.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2021-02-09 17:04:15 +08:00
He Weiwei
a0561da5ce
test: fix the TestRetryUntil (#14210) 
Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2021-02-09 13:25:22 +08:00
Daniel Jiang
0b2ef922c0
Escape the service and email passed via request (#14186) 
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2021-02-08 14:34:52 +08:00
Steven Zou
8725fa3af5
Merge pull request #14198 from steven-zou/fix/issue_#14079 
fix(jobservice):wrong depth of job logging
 2021-02-08 11:38:46 +08:00
Steven Zou
21a40467bb
Merge pull request #14187 from ywk253100/210205_recover_cherrypick 
[cherry-pick]Recover the panic of the process of replication adapter and fix bug of gitlab adapter
 2021-02-07 19:51:13 +08:00
Steven Zou
d61e560890 fix(jobservice):wrong depth of job logging 
- use separate std logger for job, not shared with jobservice std logger
- merge and remove useless functions

Signed-off-by: Steven Zou <szou@vmware.com>

fix #14079
 2021-02-07 18:07:02 +08:00
danfengliu
f51bcd9fdf
Merge pull request #14092 from dirkmueller/zip_slip 
Update oras to 0.9.0 to fix "zip slip" vulnerability
 2021-02-07 16:15:11 +08:00
Wenkai Yin(尹文开)
a7a8b6fa28
Merge pull request #14190 from ninjadq/fix_http_ineternl_metric_port 
Fix metrics template for http mode
 2021-02-07 11:11:48 +08:00
piotrekfilip
db47cf7f46
Add support for http proxy in oidc insecureTransport 
Signed-off-by: piotrekfilip <43957913+piotrekfilip@users.noreply.github.com>
 2021-02-06 12:42:38 +01:00
DQ
307c5a8ed4 Fix metrics template for http mode 
the port shouldn't be hardcode

Signed-off-by: DQ <dengq@vmware.com>
 2021-02-05 18:44:28 +00:00
Wenkai Yin
cc3e240d56 Recover the panic of the process of replication adapter and fix bug of gitlab adapter 
Recover the panic of the process of replication adapter
Fix bug of gitlab adapter
Fixes #14153

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2021-02-05 20:21:10 +08:00
Ziming Zhang
ec83f49a1a fix(retention) migrate sql error 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
 2021-02-05 09:09:26 +00:00
Wang Yan
24ec772978
fix gc migration issue (#14174) 
For the upgrade path v1.10 - v2.1.* - v2.2.0, if user doesn't reset the GC schdule that was created in 1.10 in the v2.1,
the job parameters will keep empty in the database. The fix gives a default value for the schedule record.

Signed-off-by: Wang Yan <wangyan@vmware.com>
 2021-02-05 12:25:24 +08:00
He Weiwei
44ba7de738
fix: wrap report vuls record creating in transaction (#14176) 
Make the creating of the ReportVulnerabilityRecord in transaction to
avoid parallel problem

Closes #14171

Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2021-02-05 12:15:52 +08:00
He Weiwei
de97b900cf
fix: remove default execution sweeper count (#14168) 
1. Remove the default execution sweeper count for execution vendor.
2. Set the execution sweeper count for gc, preheat, replication,
retention to 50.
3. Disable sweep for the executions of the scan job.

Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2021-02-05 12:15:15 +08:00
Wenkai Yin(尹文开)
99bc251a13
Merge pull request #14164 from heww/update-report-improve 
fix: 404 if report not found when updating report
 2021-02-04 16:30:18 +08:00
Wang Yan
885a268268
rename permission of robot account (#14150) 
* rename permission of robot account

fixes #14060
Signed-off-by: Wang Yan <wangyan@vmware.com>
 2021-02-04 15:32:44 +08:00
He Weiwei
060a282e71 fix: 404 if report not found when updating report 
Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2021-02-04 07:10:58 +00:00
Wenkai Yin(尹文开)
9cd33ac5e7
Merge pull request #14162 from ywk253100/210204_sweeper 
[cherry-pick]Ignore the not found error in some cases
 2021-02-04 14:05:15 +08:00
Wenkai Yin(尹文开)
c45adabf5d
Merge pull request #14155 from ywk253100/210203_sweeper 
Ignore the not found error in some cases
 2021-02-04 14:02:46 +08:00
Wenkai Yin
0d44d9a2ac Ignore the not found error in some cases 
Ignore the not found error in some cases
Fixes #14154

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2021-02-04 11:41:33 +08:00