He Weiwei
3c80832341
fix(quota): order by quotas only on support resources
...
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-10-30 02:42:34 +00:00
sshijun
0c41a01f83
Improve scanner UI
...
Signed-off-by: sshijun <sshijun@vmware.com>
2019-10-29 18:47:57 +08:00
Steven Zou
19eb0ae7f4
Merge pull request #9637 from steven-zou/fix/bug_#9629
...
fix the bug of returning errors when nothing is updated
2019-10-29 17:37:06 +08:00
Steven Zou
adf780c2a5
Merge pull request #9634 from steven-zou/fix/#9632_and_#9633
...
fix bug found in the pluggable scanner
2019-10-29 17:36:19 +08:00
Will Sun
afd3b76001
Merge pull request #9567 from AllForNothing/scanner-css
...
Fix package vulnerabilities
2019-10-29 16:51:04 +08:00
jwangyangls
26453e8806
Merge pull request #9607 from jwangyangls/fix-delete-repositories-error
...
Fix the error when delete some images
2019-10-29 15:49:29 +08:00
Will Sun
c31b08ac3d
Merge pull request #8610 from AllForNothing/rep
...
change adapterInfo from by hardcode to by getting from backend API
2019-10-29 15:49:07 +08:00
Steven Zou
cb8d4d0daf
fix the bug of returning errors nothing is updated
...
- bug details: #9629
- root cause: the preconditions for updating may not be matched
Signed-off-by: Steven Zou <szou@vmware.com>
2019-10-29 15:34:34 +08:00
Steven Zou
35d074e849
fix bug found in the pluggable scanner
...
- fix #9632
- fix #9633
Signed-off-by: Steven Zou <szou@vmware.com>
2019-10-29 15:32:51 +08:00
Daniel Jiang
b17711abbf
Merge pull request #9592 from qyqcswill/code_clean
...
remove useless code
2019-10-29 15:08:59 +08:00
sshijun
4a97cf40c6
change adapterInfo from by hardcode to by getting
...
from backend API
Signed-off-by: sshijun <sshijun@vmware.com>
2019-10-29 14:13:19 +08:00
Steven Zou
10c30fde3d
Merge pull request #9618 from steven-zou/fix/bug_#9608
...
permission grant for scanner related actions are not correctly
2019-10-28 22:12:56 +08:00
Steven Zou
5b2ab34e03
permission grant for scanner related actions are not correctly
...
- add new endpoint for getting scanner candidates of specified project
- adjust the permission granting functions
- fix #9608
Signed-off-by: Steven Zou <szou@vmware.com>
2019-10-28 18:20:47 +08:00
Wang Yan
e0fd4cd609
Merge pull request #9599 from wy65701436/fix-quota-migration
...
Fix quota sync crash on getting the unknown mainfest
2019-10-28 17:47:46 +08:00
Yogi_Wang
e7c7e7ac25
Fix the error when delete some images
...
Signed-off-by: Yogi_Wang <yawang@vmware.com>
fix #9604 fix #9603
2019-10-28 15:43:50 +08:00
wang yan
fc347fc4eb
Fix quota sync crash on getting the unknown mainfest
...
1, eat the unknown manifest error, and log it. The migration process will not crashed on it.
2, enable to persist DB of sync quota API.
3, add empty project support.
Signed-off-by: wang yan <wangyan@vmware.com>
2019-10-28 15:17:08 +08:00
Steven Zou
5c4c04a122
Merge pull request #9602 from heww/upgrade-clair-adapter
...
Upgrade clair adapter to v1.0.0
2019-10-28 12:19:28 +08:00
jwangyangls
987da4212d
Merge pull request #9559 from jwangyangls/fix-immutable-bug
...
Improve Immutable tag UI
2019-10-28 11:27:38 +08:00
Wenkai Yin(尹文开)
f007a62b04
Merge pull request #9588 from stonezdj/fix_ldap_group_sql
...
Fix User Group Search SQL error
2019-10-28 11:22:14 +08:00
Yogi_Wang
26381c93be
Improve Immutable tag UI
...
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-10-28 10:07:40 +08:00
jwangyangls
e8554b9d66
Merge pull request #9587 from jwangyangls/add-webhook-tests-1.10
...
Add webhook nightly case
2019-10-28 10:05:16 +08:00
He Weiwei
28e0c0693b
Upgrade clair adapter to v1.0.0
...
1. Upgrade clair adapter to v1.0.0.
2. Make the clair adapter which installed by harbor immutable and using internal registry address.
3. Add support to build clair adapter image from binary.
4. Switch to ScannerPull action when make authorization for the scan request.
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-10-26 17:25:36 +00:00
Steven Zou
eba1a01ac2
Merge pull request #9595 from steven-zou/fix/update_scanner_failure
...
property use_internal_addr can not be updated
2019-10-25 17:39:34 +08:00
jwangyangls
8d35d36537
Merge pull request #9552 from jwangyangls/add-ut
...
Add front ut in app
2019-10-25 15:45:13 +08:00
Wang Yan
20a867a13c
Merge pull request #9579 from wy65701436/fix-id
...
update immutable rule API
2019-10-25 15:43:08 +08:00
hao.cheng
29e905271d
promote code quality
...
Signed-off-by: hao.cheng <hao.cheng@daocloud.io>
2019-10-25 15:37:35 +08:00
Steven Zou
9d0263fc9a
property use_internal_addr can not be updated
...
- pick up `use_internal_addr` in the update API
Signed-off-by: Steven Zou <szou@vmware.com>
2019-10-25 15:35:43 +08:00
Yogi_Wang
988279cdcb
Add webhook nightly case
...
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-10-25 15:25:32 +08:00
hao.cheng
94bc8c2f5c
remove useless code
...
Signed-off-by: hao.cheng <hao.cheng@daocloud.io>
2019-10-25 15:20:25 +08:00
wang yan
f9996663d8
update immutable rule API
...
1, unify disable and enable
2, fix update rule error
Signed-off-by: wang yan <wangyan@vmware.com>
2019-10-25 14:11:07 +08:00
stonezdj
f402db380b
Fix User Group Search SQL error
...
User Group Query SQL error in some cases
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-10-25 14:00:45 +08:00
Wenkai Yin(尹文开)
28ee5f7d43
Merge pull request #9302 from liuxu623/fix-fatal-error
...
fix fatal error
2019-10-25 13:16:54 +08:00
Wenkai Yin(尹文开)
91bc57d695
Merge pull request #9566 from qyqcswill/code_simplify
...
code simplify
2019-10-25 13:15:50 +08:00
jwangyangls
066dbcb658
Merge pull request #9524 from jwangyangls/modify-filter
...
Modiy the way of replication show label filter
2019-10-25 12:55:41 +08:00
Bastian Hofmann
181c5f874f
Fix broken about dialog on sign in page
...
Signed-off-by: Bastian Hofmann <bashofmann@gmail.com>
2019-10-24 15:54:29 +02:00
Steven Zou
868851cc51
Merge pull request #9571 from steven-zou/fix/support_internal_addr_scanner
...
support using internal registry addr to perform scan
2019-10-24 20:52:27 +08:00
Wang Yan
d18678a48d
Merge pull request #9506 from wy65701436/token-sevice
...
Enable robot account to support scan pull case
2019-10-24 19:52:33 +08:00
Steven Zou
cb59ba3bbc
support using internal registry addr to perform scan
...
- do changes to the sql schema
- add `UseInternalAddr` and `Immutable` properties to scanner registration
- support multiple authentication type
- basic
- bearer token
Signed-off-by: Steven Zou <szou@vmware.com>
2019-10-24 18:28:35 +08:00
wang yan
71c769ec97
remvoe bypass to scanner pull
...
Signed-off-by: wang yan <wangyan@vmware.com>
2019-10-24 17:49:20 +08:00
hao.cheng
758e7aa06f
code simplify
...
Signed-off-by: hao.cheng <hao.cheng@daocloud.io>
2019-10-24 17:42:42 +08:00
Ziming
13499fb60b
Merge pull request #9491 from bitsf/tag_retention_webhook
...
implement log for tag retention immutable tags
2019-10-24 17:06:00 +08:00
sshijun
8bab3f7cd4
Fix package vulnerabilities
...
Signed-off-by: sshijun <sshijun@vmware.com>
2019-10-24 16:37:52 +08:00
Ziming
eb6708ed76
Merge pull request #8174 from bitsf/refact_replication_info
...
refact replication info to support special endpoints and credential
2019-10-24 15:34:01 +08:00
Ziming Zhang
e757899b49
add special error/log for not delete immutable tag in tag retention job
...
Change-Id: I3440f3b888bf8c65afc75d04253eea41f20eef0e
Signed-off-by: Ziming Zhang <zziming@vmware.com>
2019-10-24 15:25:48 +08:00
Steven Zou
956d9db1d5
Merge pull request #9528 from steven-zou/fix/pluggable_scanner_improvments
...
improve the scan controlling
2019-10-24 15:17:06 +08:00
Wang Yan
4baa35bc17
Merge pull request #9520 from ywk253100/191022_health_check
...
Remove the health checker for Clair in health check API
2019-10-24 14:50:01 +08:00
Yogi_Wang
52603de9a6
Add front ut in app
...
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-10-24 13:22:36 +08:00
Ziming Zhang
1801bac03d
refact replication adapter
...
Change-Id: Ic28854089b8dcfcbc7e42065df5c19c64d5b85e7
Signed-off-by: Ziming Zhang <zziming@vmware.com>
2019-10-24 12:24:55 +08:00
Steven Zou
7fad103e46
- fix API test cases failures
...
Signed-off-by: Steven Zou <szou@vmware.com>
- fix scan report dao bug
2019-10-23 20:44:01 +08:00
wang yan
a6ad1b2db8
update code per review comments
...
Signed-off-by: wang yan <wangyan@vmware.com>
2019-10-23 20:05:51 +08:00
wang yan
2fa85aefca
fix per comments
...
Signed-off-by: wang yan <wangyan@vmware.com>
2019-10-23 18:45:30 +08:00
wang yan
5996189bb0
update per comments and fix govet error
...
Signed-off-by: wang yan <wangyan@vmware.com>
2019-10-23 18:45:30 +08:00
wang yan
22b4ea0f89
Enable robot account bypass policy check
...
1, the commit is for internal robot to bypass policy check, like vul and signature checking.
2, add a bool attribute into registry token, decode it in the harbor core and add the status into request context.
3, add a bool attribut for robot API controller, but API will not use it.y
Signed-off-by: wang yan <wangyan@vmware.com>
2019-10-23 18:45:30 +08:00
Ziming Zhang
5419e1a844
refact replication info to support special endpoints and credential
...
Change-Id: I2f7a51d3aaf57bb6d1942526184f4e62ce3afeab
Signed-off-by: Ziming Zhang <zziming@vmware.com>
2019-10-23 17:19:56 +08:00
Wenkai Yin(尹文开)
c3c8b03af5
Merge pull request #9532 from heww/issue-9151
...
fix(gc,quota): clean blob size cache in redis when gc
2019-10-23 17:03:22 +08:00
Will Sun
ee2de96c91
Merge pull request #9518 from AllForNothing/scanner-im-v2
...
Improve scanner UI
2019-10-23 17:01:26 +08:00
Wenkai Yin(尹文开)
bd28ba43c0
Merge pull request #9478 from ywk253100/191018_test
...
Populate public metadata into the event
2019-10-23 15:21:53 +08:00
Will Sun
2bee9d7047
Merge branch 'master' into scanner-im-v2
2019-10-23 14:12:42 +08:00
Steven Zou
ae3ff228e1
Merge branch 'master' into fix/pluggable_scanner_improvments
2019-10-23 13:31:39 +08:00
Steven Zou
38395e015c
fix api test case failure
...
Signed-off-by: Steven Zou <szou@vmware.com>
2019-10-23 13:27:03 +08:00
wang yan
182e557bf2
update query in the immutable delete manifest middleware
...
Signed-off-by: wang yan <wangyan@vmware.com>
2019-10-23 13:26:19 +08:00
Wenkai Yin
9d896d4d72
Remove the health checker for Clair in health check API
...
As we introduce the pluggable scanner, users can add the external scanners, so we remove the Clair from the health check API
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-10-23 12:55:03 +08:00
jwangyangls
cf87408e90
Merge pull request #9522 from jwangyangls/modify-repo-replicaiton
...
Modify the permission when add Limited Guest
2019-10-23 11:42:27 +08:00
Yogi_Wang
f38fff8eff
Modify the permission when add Limited Guest
...
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-10-23 10:31:31 +08:00
Steven Zou
962bafb7ce
fix go imports order issues
...
Signed-off-by: Steven Zou <szou@vmware.com>
2019-10-23 09:34:47 +08:00
He Weiwei
cc86664730
fix(gc,quota): clean blob size cache in redis when gc
...
Closes #9151
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-10-22 14:20:04 +00:00
wang yan
3e826c4e80
update query in the immutable delete manifest middleware
...
Signed-off-by: wang yan <wangyan@vmware.com>
2019-10-22 19:37:20 +08:00
Steven Zou
370a364c29
fix code conflict and rebase with master
...
Signed-off-by: Steven Zou <szou@vmware.com>
2019-10-22 18:39:37 +08:00
Steven Zou
dff1ee07fc
improve the scan controlling
...
- add LCM control to the robot account generated for scanning
- improve the scan webhook
- remove reprots when related artifact is deleted
- update report manager/scan controller and other components to support above cases
- add artifact manager/comtroller to list artifacts
Signed-off-by: Steven Zou <szou@vmware.com>
2019-10-22 18:24:46 +08:00
stonezdj(Daojun Zhang)
4dcd323b4a
Merge pull request #9475 from wy65701436/immu-delete-repo
...
add immutable match in the repository/tag delete api
2019-10-22 17:28:15 +08:00
Yogi_Wang
7300c9b3c3
Modiy the way of replication show label filter
...
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-10-22 16:37:08 +08:00
sshijun
7cec6c7b59
Improve scanner UI
...
Signed-off-by: sshijun <sshijun@vmware.com>
2019-10-22 16:07:23 +08:00
Wang Yan
fc106e218c
Merge pull request #9503 from heww/issue-9308
...
fix(configuration): E notation support for int64 and quota types
2019-10-22 11:50:06 +08:00
jwangyangls
7a8a07e1f6
Merge pull request #9504 from jwangyangls/enable-rule
...
Add enable rule when Edit replication
2019-10-21 20:58:41 +08:00
jwangyangls
a690851b9e
Merge pull request #9501 from jwangyangls/fix-nightly-issue-oidc
...
Improve immutable,fix oidc nightly error
2019-10-21 20:42:41 +08:00
Yogi_Wang
868fca7e31
Add enable rule when Edit replication
...
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-10-21 18:34:38 +08:00
Will Sun
d137471906
Merge pull request #9470 from AllForNothing/scanner-improve
...
Improve scanner UI
2019-10-21 18:12:05 +08:00
Wang Yan
3772ccc163
Merge pull request #9493 from stonezdj/remove_nested_group
...
Remove nested group search
2019-10-21 17:45:50 +08:00
He Weiwei
7c8f5426ed
fix(configuration): E notation support for int64 and quota types
...
Closes #9308
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-10-21 08:15:27 +00:00
Yogi_Wang
03d13ea864
Improve immutable,fix oidc nightly error
...
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-10-21 16:03:07 +08:00
wang yan
424f11e697
add immutable match in the repository/tag delete api
...
Signed-off-by: wang yan <wangyan@vmware.com>
2019-10-21 15:53:24 +08:00
Wang Yan
71bb8815bf
Merge pull request #9461 from reasonerjt/rm-validator-cve
...
Remove validation for item in CVE whitelist
2019-10-21 14:52:08 +08:00
stonezdj
b148ffe6a8
Remove the nested group search
...
Remove the code change in #8378 , because the previous code change caused issues: #9092 , #9110 , #9326
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-10-21 14:34:53 +08:00
sshijun
b406611a3d
Improve scanner UI
...
Signed-off-by: sshijun <sshijun@vmware.com>
2019-10-21 14:19:27 +08:00
He Weiwei
e254fe3095
fix(permissions): permissions checking for member and quota info ( #9490 )
...
1. Only show project member info when has member list permission.
2. Only show quota info when has quota read permission.
3. Add quota read permission for all roles of project.
4. Refactor permission service in portoal.
5. Clear cache when clear session.
Closes #8697
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-10-21 14:03:52 +08:00
jwangyangls
91b7594442
Merge pull request #9473 from jwangyangls/fix-bug-1.10
...
Fix bug in harbor UI
2019-10-21 10:11:05 +08:00
He Weiwei
bf6a14c9ad
feat(role): introduce a limited guest role ( #9403 )
...
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-10-20 14:21:28 +08:00
Wenkai Yin(尹文开)
f98196e5ba
Merge pull request #9435 from reasonerjt/oidc-refresh-refine
...
Update OIDC token refresh process
2019-10-18 19:43:34 +08:00
Wenkai Yin
db7025a504
Populate public metadata into the event
...
Fixes #9455 . Populate the public metadata into the event when doing the replication based on event
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-10-18 17:40:19 +08:00
Yogi_Wang
081e701793
Fix bug in harbor UI
...
fix #9271
fix #9207
fix #9178
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-10-18 15:40:40 +08:00
Daniel Jiang
1a9cebd5e8
Remove validation for item in CVE whitelist
...
To contain various vulnerabilities in the CVE whitelist, this commit
removes the validation.
Fixes #9242
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-10-18 15:08:32 +08:00
jwangyangls
ad46fd12aa
Merge pull request #9410 from jwangyangls/immetable-tag
...
Add immutable tag in project detail
2019-10-18 14:15:38 +08:00
Yang Wang (c)
bfe19711db
Add immutable tag in project detail
...
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-10-18 11:28:39 +08:00
Will Sun
ad053fc017
Merge pull request #9449 from AllForNothing/tag-retention-paging
...
Add server paging to tag-retention sub task list
2019-10-18 10:36:16 +08:00
Will Sun
932ed32de5
Merge pull request #9440 from AllForNothing/cve-check
...
Remove CVE ID check
2019-10-18 10:32:18 +08:00
Wenkai Yin(尹文开)
5c5e475da4
Merge pull request #9415 from steven-zou/fix/pluggable_scanner_policy_check
...
do changes to let the vul policy check compatible with new framework
2019-10-18 09:39:20 +08:00
Wang Yan
51d3134e4f
Merge pull request #9427 from wy65701436/immutable-middleware
...
add immutable tag middleware
2019-10-17 20:28:34 +08:00
Steven Zou
0f16913635
rebase: resolve the code confilcts with master
...
Signed-off-by: Steven Zou <szou@vmware.com>
2019-10-17 17:42:41 +08:00
wang yan
da02b820ad
add immutable tag middleware
...
Signed-off-by: wang yan <wangyan@vmware.com>
2019-10-17 16:58:11 +08:00
Will Sun
ddb83574a7
Merge pull request #9361 from AllForNothing/scanner-s3
...
Add pluggable scanner UI
2019-10-17 16:13:47 +08:00
Wenkai Yin(尹文开)
97ddff2ac8
Merge pull request #9434 from heww/clair-adapter
...
build(clair): internal clair adapter when install with clair
2019-10-17 16:06:10 +08:00
jwangyangls
12b8cfef61
Merge pull request #9413 from jwangyangls/reset-oidc-cli-secret
...
Add new cli secret ui in profile
2019-10-17 14:51:39 +08:00
jwangyangls
cf84026e3d
Merge pull request #9445 from jwangyangls/fix-copy-button-not-working
...
Fix copy button not working
2019-10-17 14:51:12 +08:00
sshijun
bbf61a11e3
Add server paging to tag-retention sub task list
...
Signed-off-by: sshijun <sshijun@vmware.com>
2019-10-17 14:36:41 +08:00
Yogi_Wang
4b202e9679
Fix copy button not working
...
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-10-17 13:35:12 +08:00
He Weiwei
8964a8697a
build(clair): internal clair adapter when install with clair
...
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-10-17 12:00:51 +08:00
Yogi_Wang
8d4d2ee6fa
Add new cli secret ui in profile
...
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-10-17 11:28:05 +08:00
Daniel Jiang
f0cb16cb86
Update OIDC token refresh process
...
1) Disassociate id token from user session
2) Some OIDC providers do not return id_token in the response of refresh
request:
https://openid.net/specs/openid-connect-core-1_0.html#RefreshTokenResponse
When validating the CLI secret it will not validate the id token,
instead it will check the expiration of the access token, and try to
refresh it.
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-10-17 11:26:18 +08:00
AllForNothing
c2e30b4bad
Add scanner UI
...
Signed-off-by: AllForNothing <sshijun@vmware.com>
2019-10-17 10:27:54 +08:00
jwangyangls
8d65bd6da7
Merge pull request #9426 from jwangyangls/remove-validate-in-oidc-claim
...
Remove validation about oidc claim group
2019-10-17 10:03:47 +08:00
sshijun
645e9331b0
Remove CVE ID check
...
Signed-off-by: sshijun <sshijun@vmware.com>
2019-10-17 09:23:45 +08:00
Steven Zou
f18afc0a3f
do changes to let the vul policy check compatiable with new framework
...
- update the scan/scanner controller
- enhance the report summary generation
- do changes to the vulnerable handler
- remove the unused clair related code
- add more UT cases
- update the scan web hook event
- drop the unsed tables/index/triggers in sql schema
Signed-off-by: Steven Zou <szou@vmware.com>
2019-10-16 23:15:26 +08:00
stonezdj(Daojun Zhang)
2973ddcf6b
Merge pull request #9428 from stonezdj/disable_self_reg
...
Update default self_registration=false
2019-10-16 17:41:21 +08:00
Wenkai Yin(尹文开)
32a2c41c3b
Merge pull request #9273 from gavinfish/typo
...
Fix typos in core package
2019-10-16 17:10:35 +08:00
stonezdj
3636a1afa5
Update default self_registration=false
...
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-10-16 01:33:48 -07:00
Ziming
3725667448
Merge branch 'master' into feat/gitlab
2019-10-16 14:34:21 +08:00
Qian Deng
6447294741
Merge pull request #9405 from heww/speed-up-test
...
perf(test): speed up TestAddBlobsToProject test in dao pkg
2019-10-16 13:45:58 +08:00
Yogi_Wang
baa5f1171e
Remove validation about oidc claim group
...
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-10-16 11:17:36 +08:00
Wenkai Yin(尹文开)
372875ad64
Merge pull request #9393 from wy65701436/immutable-match
...
add immutable match
2019-10-15 18:51:43 +08:00
stonezdj(Daojun Zhang)
ff04b2c930
Merge pull request #9411 from wy65701436/fix-list-robot
...
fix list robot account API return an internal error
2019-10-15 17:47:38 +08:00
wang yan
ae4c698ab4
use only 1 repo and tag selector to match
...
Signed-off-by: wang yan <wangyan@vmware.com>
2019-10-15 16:44:17 +08:00
wang yan
288e4cc193
igonre the duplicate error when to insert project_blobs on quota syncing
...
Signed-off-by: wang yan <wangyan@vmware.com>
2019-10-15 14:14:58 +08:00
wang yan
5e8f7297f5
fix list robot account API return an internal error
...
Signed-off-by: wang yan <wangyan@vmware.com>
2019-10-15 12:29:44 +08:00
Will Sun
285d3e1e5c
Merge pull request #9189 from strainovic/patch-1
...
Use external_url if exists on Add Repo Command chart details page
2019-10-15 12:18:37 +08:00
He Weiwei
d9a539807b
perf(test): speed up TestAddBlobsToProject test in dao pkg
...
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-10-14 16:46:01 +00:00
liuxu
79322f2df2
fix fatal error
...
Signed-off-by: liuxu <liuxu623@gmail.com>
2019-10-14 21:41:29 +08:00
Will Sun
0076f23195
Merge pull request #9377 from zhoumeina/add_ut
...
add more unit test
2019-10-14 17:16:03 +08:00
Steven Zou
e0901410e1
Merge pull request #9381 from beautytiger/dev-191011-fixtime
...
fix wrong time parse by wrong year representation
2019-10-14 17:02:06 +08:00
Daniel Jiang
ee9e92b6dd
Merge pull request #9157 from phin1x/master
...
Escape user dn in ldap group search filter
2019-10-14 16:41:27 +08:00
wang yan
a3546478eb
add immutable match
...
Signed-off-by: wang yan <wangyan@vmware.com>
2019-10-14 16:21:32 +08:00
wang yan
7c16cbfeef
fix scan controller test introduced by api change
...
Signed-off-by: wang yan <wangyan@vmware.com>
2019-10-14 14:39:46 +08:00
wang yan
25f638a989
Merge branch 'master' of https://github.com/goharbor/harbor into robot-invisiable
2019-10-14 14:35:45 +08:00
wang yan
c597e46756
do not expose visible attribute of robot account to user
...
Signed-off-by: wang yan <wangyan@vmware.com>
2019-10-14 14:11:09 +08:00
Wang Yan
17ad4aca55
Merge pull request #9343 from ywk253100/191009_bug_fix
...
Check the existence of project before the next action
2019-10-14 11:27:34 +08:00
Wenkai Yin(尹文开)
7d0505593f
Merge pull request #8556 from chlins/feat/image-replication-adapter-for-quay.io
...
Feat/image replication adapter for quay.io
2019-10-14 09:16:45 +08:00
Steven Zou
6e8e601c8d
make robot account with new robot controller
...
Signed-off-by: Steven Zou <szou@vmware.com>
2019-10-12 16:34:08 +08:00
Steven Zou
a86afd6ebc
Merge branch 'master' into feature/pluggable_scanner_s3_merge
2019-10-12 15:18:06 +08:00
wang yan
3e81bd7f1d
add visible attribute to robot account
...
The commit is to make robot controller could create invisible robot account for internal use
Signed-off-by: wang yan <wangyan@vmware.com>
2019-10-12 00:51:48 +08:00
Guangming Wang
bea8609a58
fix wrong time parse by wrong year representation
...
Signed-off-by: Guangming Wang <guangming.wang@daocloud.io>
2019-10-11 22:59:40 +08:00
Wang Yan
40d80f82ba
Merge pull request #9368 from reasonerjt/set-cli-secret-api
...
API for user to set the CLI secret
2019-10-11 18:38:58 +08:00
Wang Yan
d7375992b5
Merge pull request #9363 from wy65701436/robot-refactor
...
refactor robot api
2019-10-11 18:16:28 +08:00
Steven Zou
9fd8b6306c
refactor code to reflect code review comments
...
- refactor the db schema \
- refactor permission checking in API handlers \
to follow the latest code/interface changes
Signed-off-by: Steven Zou <szou@vmware.com>
2019-10-11 18:07:47 +08:00
wang yan
6f6f113f0f
refactor robot api
...
1, add API controller for robot account, make it callable internally
2, add Manager to handler dao releate operation
Signed-off-by: wang yan <wangyan@vmware.com>
2019-10-11 17:26:18 +08:00
Meina Zhou
728cea5859
add more unit test
...
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-10-11 17:25:50 +08:00
Daniel Jiang
53a13e165d
API for user to set the CLI secret
...
This commit replace the API to generate CLI secret with a new API to
update the secret
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-10-11 14:15:08 +08:00
Steven Zou
58afd8e14b
[stage3] support pluggable scanner
...
- implement scan controller
- add scan resource and update role bindings
- update registration model and related interfaces
Signed-off-by: Steven Zou <szou@vmware.com>
- implement scan API to do scan/get report/get log
- update repository rest API to produce scan report summary
- update scan job hook handler
- update some UT cases
- update robot account making content
- hidden credential in the job log
Commnet scan related API test cases which will be re-activate later
fix #8985
fix the issues found by codacy
Signed-off-by: Steven Zou <szou@vmware.com>
2019-10-11 12:53:02 +08:00
chlins
4ab3b864ae
feat: add image replication adapter for quay.io
...
Signed-off-by: chlins <chlins.zhang@gmail.com>
2019-10-11 10:00:07 +08:00
wang yan
8c155e0c50
fix quota migration still execute on launch even data sync success
...
This commit is to fix the issue for the following scenario:
1, user success migrate harbor to v1.9.0 from a previous version
2, add a project, push images into the project.
3, delete images and then to delete the project.
4, re-launch harbor.
After that, it still execute the quota migration as the condition doesn't consider the deleted projects usage.
And in this case, the harbor core crashes with a duplicate sql err, and unable to launch.
[Workaroud]
Clean table of project_blob with: TRUNCATE TABLE project_blob, and re-launch harbor, wait for quota sync success.
Signed-off-by: wang yan <wangyan@vmware.com>
2019-10-11 01:25:21 +08:00
Mia ZHOU
a87ab69baa
Merge pull request #9351 from zhoumeina/add_ut
...
Add frontend unit test
2019-10-10 13:00:20 +08:00
Meina Zhou
e7f8ac6464
add unit test
...
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-10-10 12:07:27 +08:00
stonezdj(Daojun Zhang)
a2938c5d78
Merge pull request #9274 from wy65701436/immu-refatctor
...
refactor immutable dao code to align the new structure under pkg
2019-10-10 10:38:22 +08:00
Wenkai Yin(尹文开)
0a85acac9a
Merge pull request #9329 from chlins/feat/jfrog-docker-registry
...
feat(replication): support for jfrog artifactory docker image replica…
2019-10-10 09:41:41 +08:00
wang yan
8317100cda
continue refactor API
...
Signed-off-by: wang yan <wangyan@vmware.com>
2019-10-09 23:06:35 +08:00
chlins
0e0c42d3c0
feat(replication): support for jfrog artifactory docker image replication
...
Signed-off-by: chlins <chlins.zhang@gmail.com>
2019-10-09 21:06:36 +08:00
Wenkai Yin
a61c928e34
Check the existence of project before the next action
...
Fixes #8234 , check the existence of project to avoid the panic
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-10-09 16:54:10 +08:00
jwangyangls
f5af75cc8a
Merge pull request #9332 from jwangyangls/fix-setting-golobal-harbor
...
Fix setting.json bug
2019-10-09 13:19:02 +08:00
Yogi_Wang
4347d2e06d
Fix setting.json bug
...
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-10-09 11:50:45 +08:00
Meina Zhou
0660c66958
remove bootstrap
...
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-10-08 12:51:32 +08:00
Wang Yan
fb8a1bf589
Merge pull request #9280 from heww/robot-acoount-improvement
...
fix(robot): robot account improvement
2019-09-27 13:02:20 +08:00
He Weiwei
4ce72e37c4
fix(robot): robot account improvement for policies
...
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-09-27 03:07:58 +00:00
Will Sun
94f6df9b47
Merge pull request #9282 from AllForNothing/master
...
fix language expression issue for tag retention
2019-09-27 10:55:33 +08:00
sshijun
717fcb555a
fix language expression issue for tag retention
...
Signed-off-by: sshijun <sshijun@vmware.com>
2019-09-27 09:53:23 +08:00
wang yan
7c4fd79b5c
refactor immutable dao code to align the new structure under pkg
...
1, add manager
2, move model dao to /pkg/dao
Signed-off-by: wang yan <wangyan@vmware.com>
2019-09-26 20:35:58 +08:00
Jie Shen
673f6e6068
Fix typos in core package
...
Signed-off-by: Jie Shen <drfish.me@gmail.com>
2019-09-26 19:56:27 +08:00
Wenkai Yin(尹文开)
cabe0b6243
Merge pull request #9253 from heww/patch-blob-upload-improvement
...
Patch blob upload improvement
2019-09-26 13:59:15 +08:00
Qian Deng
d2d0affcae
Merge pull request #9245 from ninjadq/check_logid
...
Add checking for logid
2019-09-26 10:26:49 +08:00
lxShaDoWxl
a40b0f349b
In order to integrate with gitlab it is necessary to get a list of available repositories using gitlab api. This is because gitlab registry does not give access to _catalog
...
Signed-off-by: lxShaDoWxl <lxshadowxkingxl@gmail.com>
2019-09-25 21:32:00 +06:00
stonezdj(Daojun Zhang)
ce824a6eb9
Merge pull request #9141 from stonezdj/immutable_tag_api
...
Immutable tag api
2019-09-25 19:01:14 +08:00
Wenkai Yin(尹文开)
3b75ff8a4d
Merge pull request #9252 from ywk253100/190925_sql
...
Make the username required when searching user
2019-09-25 18:26:33 +08:00
Wenkai Yin(尹文开)
ac17afac1f
Merge pull request #9243 from ninjadq/change_file_permission_of_joblog
...
change the permission of job log file
2019-09-25 17:45:21 +08:00
Mia ZHOU
5ebc3831ea
Merge pull request #9251 from zhoumeina/fix_coverage
...
add more unit test
2019-09-25 17:25:57 +08:00
He Weiwei
3e515bfabb
feat(quota): skip to save blob size when quota disabled
...
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-09-25 09:19:20 +00:00
He Weiwei
d8c2bf6f86
fix(quota): handle range header missing in response
...
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-09-25 09:17:22 +00:00
stonezdj
cc22a175b9
Add immutable tag API
...
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-09-25 15:53:56 +08:00
Meina Zhou
f4a784909b
add more unit test
...
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-09-25 15:29:17 +08:00
Steven Zou
c38e566a7e
Merge pull request #9195 from ywk253100/190920_ignore_cred
...
Update the error log format
2019-09-25 14:41:32 +08:00
DQ
e078b1c209
Add checking for logid
...
the logid content need check before use
Signed-off-by: DQ <dengq@vmware.com>
2019-09-25 13:55:32 +08:00
Wenkai Yin
83e7213d18
Make the username required when searching user
...
Make the username required when searching user and remove the support for query email
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-09-25 13:32:29 +08:00
DQ
4333c3ad5c
change the permission of job log file
...
Log file permission from 644 to 600
Signed-off-by: DQ <dengq@vmware.com>
2019-09-24 20:04:17 +08:00
Wenkai Yin(尹文开)
360334991e
Merge pull request #9198 from ywk253100/190923_ping
...
Return the common error message when testing the webhook endpoint
2019-09-24 18:51:21 +08:00
Wenkai Yin(尹文开)
4192a692cd
Merge pull request #9200 from ywk253100/190923_oidc_ping
...
Return a common error message when testing the oidc provider
2019-09-24 18:49:23 +08:00
Mia ZHOU
71dc9abcd6
Merge pull request #9226 from zhoumeina/fix_ut
...
fix harbor portal unit test and set thresholds
2019-09-24 16:52:23 +08:00
Meina Zhou
da85d5fef1
fix harbor portal unit test and set thresholds
...
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-09-24 15:15:49 +08:00
danfengliu
7844ca0a2f
Merge pull request #9214 from danfengliu/add-nightly-test-case-of-retag-under-readonly-mode
...
Add id for system configuration repo-readonly-checkbox in UI code
2019-09-24 10:43:55 +08:00
Danfeng Liu (c)
3c8db37616
Add id for system configuration repo-readonly-checkbox in UI code, and add element locator in robot case.
...
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
2019-09-23 21:55:27 +08:00
stonezdj(Daojun Zhang)
ec559b0585
Merge pull request #9123 from stonezdj/immutable_tags
...
Add DAO for immutable tags
2019-09-23 21:46:07 +08:00
Steven Zou
a73f896f23
Merge pull request #9154 from steven-zou/feature/pluggable_scanner_s2
...
[stage2]support pluggable scanner
2019-09-23 21:12:27 +08:00
danfengliu
7144f23857
Merge pull request #9204 from danfengliu/add-id-for-sign-up-btn
...
Modify sign-up button xpath from relative html path to id
2019-09-23 18:00:51 +08:00
stonezdj
29d2bcce99
Add DAO for immutable tags
...
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-09-23 16:45:07 +08:00
Steven Zou
d616bc3509
add scan report CRUD supporting and
...
- change error collection in scan job
- add dead client checking in client pool
- change key word type to interface{} for q.Query
- update bearer authorizer
- add required UT cases
Signed-off-by: Steven Zou <szou@vmware.com>
2019-09-23 16:21:39 +08:00
Danfeng Liu (c)
cca1fab069
Modify sign-up button xpath from relative html path to id, and modify script.
...
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
2019-09-23 15:40:27 +08:00
Wenkai Yin
c2e529576a
Update the error log format
...
Update the erro log format in jobservice
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-09-23 15:40:04 +08:00
Mia ZHOU
dfa9d61ef3
Merge pull request #9203 from zhoumeina/add_unit_test
...
Karma test refactor to support test in portal and coverage report
2019-09-23 15:27:52 +08:00
Ziming
df625f4ef9
Merge pull request #9177 from bitsf/fix_tag_retention_test
...
adjust wait job timeout in test case
2019-09-23 14:47:05 +08:00
Wenkai Yin
6efdfa5fb4
Return a common error message when testing the oidc provider
...
Returning a common error when failed to test the oidc provider and printing the detail in the log
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-09-23 14:43:38 +08:00
Wenkai Yin
7056d6604b
Return the common error message when testing the webhook endpoint
...
This commit returns a common error message when testing the webhook endpoint and prints the detail in the log for debug
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-09-23 14:38:47 +08:00
Meina Zhou
898442370a
Karma test refactor to support test in portal and coverage report
...
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-09-23 13:52:07 +08:00
Steven Zou
0c19eba8c2
[stage2]support pluggable scanner
...
- add scanner rest API v1 spec
- implement v1 client which is used to talk to scanner adapter
- adjust data/orm models
- adjust code package structure
Signed-off-by: Steven Zou <szou@vmware.com>
- implement scan client which is used to talk to scanner adapter
- implement scan job which take the work of communicating with scanner
- update scanner mgmt API routes
- add corresponding UT cases
2019-09-23 09:37:54 +08:00
Nenad Strainovic
84d7307e28
Use external_url if exists on Add Repo Command chart details page
...
Signed-off-by: strainovic <nenad.strainovic@gmail.com>
2019-09-21 01:08:37 +02:00
Ziming Zhang
f6ac2687fa
fix dayspl/daysps test
...
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I3c654e305f774c2329109888f68e708efeca721e
2019-09-20 18:32:58 +08:00
Daniel Jiang
f491061b57
Merge pull request #8440 from gklp/gklp_issue_8197_wrong_header_content_type_after_redirection
...
All redirect operations should have content-type as json
2019-09-20 17:21:01 +08:00
Daniel Jiang
6effa2105a
Merge pull request #9142 from reasonerjt/oidc-groups
...
Support OIDC groups
2019-09-20 17:12:50 +08:00
jwangyangls
3144635ea1
Merge pull request #9139 from jwangyangls/add-oidc-claim
...
Add oidc group claim in config-auth、member、administrator
2019-09-20 15:58:31 +08:00
Yogi_Wang
63f135337e
Add oidc group claim
...
1. add oidc group claim in configration page
2. add oidc group-page in user page,you can go to it through clicking add-group button;
3. add oidc list page in administrator ,admin can go to this page
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-09-20 13:53:25 +08:00
Daniel Jiang
f1367064fb
Address review comment
...
Address review comments for commit
b21f9dc6f1
and resolve conflict
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-09-20 13:42:39 +08:00
Daniel Jiang
07dd14d3b5
Generate new session ID after login
...
This commit mitigates the Session Fixation issue by making sure a new
session ID is generated each time user logs in to Harbor
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-09-19 20:51:50 +08:00
Fabian
1467f4bbb1
Escape User DN
...
Signed-off-by: Fabian Weber <fa.weber@enbw.com>
2019-09-19 14:29:09 +02:00
Daniel Jiang
b21f9dc6f1
Support OIDC groups
...
This commit enable project admin to add group as project member when
Harbor is configured against OIDC as AuthN backend.
It populates the information of groups from ID Token based on the claim
that is set in OIDC settings.
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-09-19 17:49:31 +08:00
danfengliu
c360e71d51
Merge pull request #9148 from AllForNothing/add-member-nightly
...
Improve project name validator when adding new project
2019-09-19 17:13:31 +08:00
Steven Zou
4c4897aef1
Merge pull request #9134 from steven-zou/feature/pluggable_scanners
...
support pluggable scanner
2019-09-19 16:08:24 +08:00
sshijun
6b2ba60c1e
Improve project name validator when adding new project
...
Signed-off-by: sshijun <sshijun@vmware.com>
2019-09-19 13:53:36 +08:00
Yogi_Wang
450184c4ec
Add id in repo info button
...
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-09-19 12:21:07 +08:00
Steven Zou
e324a4d623
support pluggable scanner
...
- add DAO layer for scanner registration
- add CURD manager for scanner registration
- add API controller for plug scanner
- add REST APIs for CURD of plug scanner
- add migration sql:0011_1.10.0
- add scan interface definition (no implementations)
- add related UT cases with testify
fix #8979 #8990
Signed-off-by: Steven Zou <szou@vmware.com>
2019-09-18 21:56:45 +08:00
Steven Zou
ae0c129b27
Merge pull request #9125 from wy65701436/refactor-selector
...
refactor selector of retention
2019-09-18 18:27:16 +08:00
jwangyangls
e226f0a258
Merge pull request #9137 from jwangyangls/fix-group-clarity-ui
...
Supplement group ui
2019-09-18 17:45:24 +08:00
wang yan
42a5db83b2
refactor selector of retention
...
extract select from pkg/retention, move it to pkg/artselector to make it usable by immutable tag
Signed-off-by: wang yan <wangyan@vmware.com>
2019-09-18 16:38:41 +08:00
Will Sun
81a143855e
Merge pull request #9136 from AllForNothing/css-modify
...
Modify css for add-memeber page and project-config page
2019-09-18 16:29:20 +08:00
Yogi_Wang
069f884a7c
Supplement group ui
...
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-09-18 16:02:58 +08:00
sshijun
e7b2b4bb03
Modify css for add-memeber page and project-config page. Format
...
global.scss file
Signed-off-by: sshijun <sshijun@vmware.com>
2019-09-18 14:58:44 +08:00
Will Sun
de550c4073
Merge pull request #8901 from phantooom/master
...
fix portal Chinese translate
2019-09-18 14:18:46 +08:00
jwangyangls
6dd2ae90a0
Merge pull request #9011 from jwangyangls/upgrade_clarity-2.1
...
Upgrade angular from 7.1.3 to 8.2.0 and clarity from 1.0 to 2.2
2019-09-18 10:45:40 +08:00
Yogi_Wang
a7c7a8e675
Upgrade angualr from 7.1.3 to 8.2.0 and clarity from 1.0 to 2.2
...
Signed-off-by: Yogi_Wang <yawang@vmware.com>
Signed-off-by: Meina Zhou <meinaz@vmware.com>
Signed-off-by: sshijun <sshijun@vmware.com>
2019-09-18 10:12:20 +08:00
wang yan
5498b5719b
remove filter redeclared as imported package name in base.go
...
It's introduced by https://github.com/goharbor/harbor/pull/8976
Signed-off-by: wang yan <wangyan@vmware.com>
2019-09-17 16:36:59 +08:00
Wang Yan
f77ce4aa3a
Merge pull request #8976 from ninjadq/add_auth_for_project_head
...
Fix: Add authenticate to projects head
2019-09-17 14:02:45 +08:00
Daniel Jiang
f36efa4dcd
Add groups claim to OIDC configuration
...
This commit add the new setting "oidc_groups_claim" to Harbor's
configurations.
And add "group_claim" to OIDCSetting struct.
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-09-16 15:54:14 +08:00
sshijun
30e8e2bbe1
change element id in config page
...
Signed-off-by: sshijun <sshijun@vmware.com>
2019-09-12 15:55:05 +08:00
Daniel Jiang
753219834e
Merge pull request #8960 from ninjadq/upgrade_hash_alg_for_pswd
...
Upgrade hash alg for pswd
2019-09-12 11:22:39 +08:00
Wenkai Yin
089eb4c449
Add the port 8080 to the default URL of portal to avoid the health check API failure
...
We changed the listenning port of portal from 80 to 8080 to run the process as non-root user, but the change didn't update the default URL of portal in source code, this causes the health check API fail.
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-09-11 10:45:55 +08:00
sshijun
026f3f4782
change button text from "ADD SYSTEM" to "COPY FROM SYSTEM" in project config page
...
Signed-off-by: sshijun <sshijun@vmware.com>
2019-09-10 16:11:10 +08:00
Wenkai Yin(尹文开)
f3af35f07a
Merge pull request #9021 from ywk253100/190909_scan_cron
...
Check the status behind error when trying to update the scan schedule
2019-09-10 13:15:27 +08:00
Wenkai Yin(尹文开)
52d0828718
Merge pull request #8981 from cd1989/replication-jobs-timezone
...
[Cherry-Pick] Replication jobs timezone
2019-09-10 09:59:33 +08:00
lxShaDoWxl
6937731744
feat(Registries): added gitlab adapter
...
Signed-off-by: lxShaDoWxl <lxshadowxkingxl@gmail.com>
2019-09-09 21:21:21 +06:00
DQ
ea5c27fcd5
Enhance: Upgrade encrypt alg to sha256
...
previous sha1 will still used for old password
Signed-off-by: DQ <dengq@vmware.com>
2019-09-09 21:48:21 +08:00
Yogi_Wang
537a501b49
Add page routing permission to prevent refresh from entering the error page
...
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-09-09 14:57:56 +08:00
Wenkai Yin
3b07be5a72
Check the status behind error when trying to update the scan schedule
...
Check the status behind error when trying to update the scan schedule
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-09-09 13:31:10 +08:00
cd1989
08f15cee26
Handle zero time in UI
...
Signed-off-by: cd1989 <chende@caicloud.io>
2019-09-06 17:48:54 +08:00
cd1989
8990a621d6
Not use time pointer in model fields
...
Signed-off-by: cd1989 <chende@caicloud.io>
2019-09-06 17:48:08 +08:00
Ziming Zhang
722e45b20b
add swagger for tag retention
...
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I0f3ed8085e231868de74c273ba85946826181d5b
2019-09-06 17:27:20 +08:00
DQ
4ac145b45b
Fix: Add authenticate to projects head
...
Project head only allow authenticated user to call.
Signed-off-by: DQ <dengq@vmware.com>
2019-09-06 14:50:47 +08:00
Daniel Jiang
76a79869df
The default item list should be empty list,not null
...
This commit make sure that the "items" in response of project level
CVE_whitelist is not null, even when it's null in the DB the API will
return an empty list
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-09-04 17:59:56 +08:00
Will Sun
697ec2a52f
Merge pull request #7952 from qiqizjl/log_bugs
...
Fix some bugs in the Log page
2019-09-04 10:10:28 +08:00
gklp
dee3defeff
refactored
...
Signed-off-by: gklp <gokalpkuscu@gmail.com>
2019-09-03 21:46:52 +03:00
gklp
44a9e5d127
All redirect operations should have content-type as json
...
Signed-off-by: gklp <gokalpkuscu@gmail.com>
2019-09-03 21:46:52 +03:00
wang yan
d8e17b122e
add read only for quota switcher
...
Signed-off-by: wang yan <wangyan@vmware.com>
2019-09-03 14:08:39 +08:00
Will Sun
cf1b7cbc41
Merge pull request #8916 from AllForNothing/nightly
...
fix add-member nightly case failure
2019-09-03 11:27:05 +08:00
jwangyangls
1165bd6d0c
Merge branch 'master' into log_bugs
2019-09-03 10:45:58 +08:00
Wang Yan
2194834b41
Merge pull request #8910 from heww/foreign-layers
...
fix(quota): correct size quota for image with foreign layers
2019-09-03 00:29:24 +08:00
Wang Yan
fd4c259821
Merge pull request #8919 from wy65701436/fix-setresusage-outofrange
...
fix int out of range when to set usage in GC job
2019-09-02 23:34:46 +08:00
He Weiwei
f44b75f398
fix(quota): correct size quota for image with foreign layers
...
1. Sync blobs from manifest for image with foreign layers.
2. Ignore size of foreign layers when compute size quota.
3. Fix repo info of artifact when upgrade from 1.8 version.
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-09-02 14:10:58 +00:00
wang yan
d3f7d01a69
fix int out of range when to set usage in GC job
...
Signed-off-by: wang yan <wangyan@vmware.com>
2019-09-02 18:48:10 +08:00
Wenkai Yin(尹文开)
7d151946e0
Merge pull request #8917 from reasonerjt/fix-create-admin-user
...
Disallow creating an admin user when registration
2019-09-02 18:43:41 +08:00
sshijun
aab50ab642
fix add-member nightly case failure
...
Signed-off-by: AllForNothing <sshijun@vmware.com>
2019-09-02 17:10:25 +08:00
Wenkai Yin(尹文开)
d762e0730a
Merge pull request #8843 from heww/fix-chart-builder
...
fix(chart,quota): fix path regexp of chart creation and deletion
2019-09-02 15:59:18 +08:00
Daniel Jiang
1a57f67413
Merge pull request #8907 from airadier/handle-error-on-oidc-callback
...
Handle error on OIDC callback
2019-09-02 13:36:11 +08:00
Will Sun
33eaf37edf
Merge pull request #8890 from AllForNothing/imp-validator
...
fix UI bug for tag-retention and project-quota
2019-09-02 10:21:16 +08:00
xaleeks
8fd8c5f345
Merge pull request #8515 from ruzickap/patch-1
...
Typo fix in en-us-lang.json
2019-09-01 18:27:30 +08:00
Iradier, AlvaroJose
bf9ac08c89
Handle error on OIDC callback
...
If wrong OIDC scopes are defined, or there are some configuration errors, the OIDC callback query string might contain "error=..." with an error message. Intercept this case and show an error to the user instead of trying to exchange the token with a missing "code" parameter.
Signed-off-by: Iradier, AlvaroJose <AlvaroJose.Iradier@adidas.com>
Change error variable name
Signed-off-by: Iradier, AlvaroJose <AlvaroJose.Iradier@adidas.com>
2019-08-30 13:44:12 +02:00
Daniel Jiang
93f86e321b
Merge pull request #8903 from wy65701436/fix-8807
...
fix #8807
2019-08-30 18:23:05 +08:00
Wenkai Yin(尹文开)
8c67f71b5e
Merge pull request #8902 from wy65701436/fix-8888
...
fix #8888
2019-08-30 18:09:56 +08:00
wang yan
c28920c84f
fix #8807
...
Format the error of mount blob, return a http error so that the core can parse it.
Signed-off-by: wang yan <wangyan@vmware.com>
2019-08-30 16:29:47 +08:00
xiaorui.zou
a727915fde
fix portal Chinese translate
...
Signed-off-by: xiaorui.zou <zourui@mskj.com>
Signed-off-by: xiaorui.zou <xiaorui.zou@gmail.com>
2019-08-30 15:33:08 +08:00
wang yan
dd9f028fe0
fix #8888
...
the image may has the same blobs as the references, which causes the artifact & blobs
can not be inserted by unique constraint
Signed-off-by: wang yan <wangyan@vmware.com>
2019-08-30 15:30:05 +08:00
Wang Yan
240b718508
Merge pull request #8887 from wy65701436/fix-8886
...
fix(quota/sync) #8886
2019-08-30 15:06:35 +08:00
AllForNothing
f597b89100
fix UI bug for tag-retention and project-quota
...
Signed-off-by: AllForNothing <sshijun@vmware.com>
2019-08-30 13:34:37 +08:00
Ziming Zhang
22e7f22b30
tag retention fix duration and show trigger
...
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I7f93dd4c1b93b8d7e6b2c2a14fd4ccf128945def
Signed-off-by: Ziming Zhang <zziming@vmware.com>
2019-08-30 11:48:11 +08:00
Wenkai Yin(尹文开)
881884786d
Merge pull request #8883 from bitsf/tag_retention_log
...
enhance tag retention log
2019-08-30 10:48:01 +08:00
Ziming Zhang
247ef1b884
enhance tag retention log
...
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: Id5946c2dd53868fdd5f5abbcca45e453bc9ba4fd
Signed-off-by: Ziming Zhang <zziming@vmware.com>
2019-08-29 18:40:00 +08:00
wang yan
16b910e1cf
fix(quota/sync) #8886
...
The foreign layer won't be counted into project quota
NOTE: the foreign layer will be dumped from the registry in the migration
Signed-off-by: wang yan <wangyan@vmware.com>
2019-08-29 17:29:40 +08:00
Ziming Zhang
8fb6e2f65b
verify permission of GetRetentionExecTaskLog
...
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I4bf4ddf3d3ed6f07a4618e242e2f3774996716d6
Signed-off-by: Ziming Zhang <zziming@vmware.com>
2019-08-29 15:01:53 +08:00
Wang Yan
db5781bf78
Merge pull request #8860 from wy65701436/fix-quota-sync
...
fix quota sync issues
2019-08-29 13:45:38 +08:00
wang yan
5decb56369
update code per review comments
...
Signed-off-by: wang yan <wangyan@vmware.com>
2019-08-29 12:46:42 +08:00
Wang Yan
03309680ff
Merge pull request #8873 from bitsf/tag_retention_log_time
...
show empty if time is 0
2019-08-29 12:39:22 +08:00
Daniel Jiang
9fa70db866
Merge pull request #8867 from bitsf/tag_retention_same_digest_tag
...
Tag retention same digest tag
2019-08-29 12:26:44 +08:00
Wenkai Yin(尹文开)
5da4286ef4
Hard delete project metadata ( #8856 )
...
Hard delete project metadata
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-08-29 12:14:39 +08:00
Ziming Zhang
57a34a7d8d
show empty if time is 0
...
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I5acc13714dbb1dc1d8bf3f1c6c620a7d54f86910
2019-08-29 12:10:22 +08:00
Ziming Zhang
6137065eba
prevent retained tag with same digest deleted by other tag
...
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I527ec87f48348c6607b1c9529c90f5ad804bd8f6
2019-08-29 10:21:13 +08:00
Mia ZHOU
9a4627c583
Merge pull request #8863 from jwangyangls/add-endpoint-id
...
Add id in endpoint url
2019-08-29 09:30:13 +08:00
Will Sun
fb66d58334
Merge pull request #8864 from AllForNothing/master
...
remove whitespaces when add tag-retention rule
2019-08-29 08:56:52 +08:00
wang yan
942e793f20
fix quota sync issues
...
1, fix #8858 , add retry to ping backend service
2, fix #8859 , split the blobs data when larger then 65535
Signed-off-by: wang yan <wangyan@vmware.com>
2019-08-28 18:59:25 +08:00
Daniel Jiang
b6db8a8a10
Disallow creating an admin user when registration
...
This commit enhance the `POST /api/users` API to block request from non-admin to create
admin user.
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-08-28 18:30:27 +08:00
Ziming Zhang
4248f7a45e
prevent retained tag with same digest deleted by other tag
...
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I37a3ef0d4cff7214e35076453494d89f0ad84d43
2019-08-28 18:27:35 +08:00
Ziming Zhang
8290af6d25
prevent retained tag with same digest deleted by other tag
...
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: Ie5f77db58e71636cd9aaf322bb3f83a0090f8877
2019-08-28 18:24:55 +08:00
Ziming Zhang
063f2bfee9
prevent retained tag with same digest deleted by other tag
...
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I6a69b405b454ca0350677204e06bfa2b24616b33
2019-08-28 17:48:42 +08:00
AllForNothing
16163f08c6
remove whitespaces when add tag-retention rule
...
Signed-off-by: AllForNothing <sshijun@vmware.com>
2019-08-28 17:31:57 +08:00
Yogi_Wang
21b59ab2a3
Add id in endpoint url
...
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-08-28 17:10:29 +08:00
Qian Deng
ed54b1da45
Merge pull request #8857 from wy65701436/fix-syne-readonly
...
fix quota sync read only setting
2019-08-28 17:04:02 +08:00
He Weiwei
2c1c816941
fix(database): generate db url by url.URL for schema upgrade ( #8852 )
...
Closes #7948
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-08-28 16:59:22 +08:00
Ziming
94138137d5
add valid for rule ( #8846 )
...
Change-Id: I82215a0cf1ec32a253c8db9bfafe7e25b26c9ad9
Signed-off-by: Ziming Zhang <zziming@vmware.com>
2019-08-28 16:58:49 +08:00
wang yan
19a37282c1
fix quota sync read only setting
...
Signed-off-by: wang yan <wangyan@vmware.com>
2019-08-28 14:53:01 +08:00
jwangyangls
81c1e9892a
Merge pull request #8831 from jwangyangls/add-pleaseholder-hub
...
Add placeholder in registry page when select helm-hub
2019-08-28 13:40:01 +08:00
Wang Yan
6045a69457
Merge pull request #8853 from wy65701436/fix-pb-dao
...
fix sql in remove blob from project
2019-08-28 11:09:19 +08:00
Wang Yan
87893abc5e
Merge pull request #8829 from ywk253100/190822_retry_status
...
Add status revision to handle retrying in replication task
2019-08-28 10:55:13 +08:00
wang yan
19f543a025
fix sql in remove blob from project
...
the project id is missing in the method, that makes GC to clean all of items,
and if quota will not compute twice for the existing manifest.
Signed-off-by: wang yan <wangyan@vmware.com>
2019-08-28 00:38:11 +08:00
Qian Deng
ea33561d95
Merge pull request #8747 from 928234269/patch1
...
fixt typo "an user" to "a user"
2019-08-27 18:26:11 +08:00
Wang Yan
be1e702d9d
Merge pull request #8787 from cd1989/core-hunging
...
Fix core hung when stop problem
2019-08-27 15:56:21 +08:00
Wang Yan
39f78ae768
Merge pull request #7872 from cd1989/config-redis-pool-idletimeout
...
Config idle timeout for redis pool to avoid jobservice restarting
2019-08-27 14:46:01 +08:00
Wenkai Yin
7924f37d86
Add status revision to handle retrying in replication task
...
Add status revision to handle retrying in replication task
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-08-27 14:17:11 +08:00
Yogi_Wang
5c8a683645
Add placeholder in registry page when select helm-hub
...
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-08-27 12:00:44 +08:00
Wenkai Yin(尹文开)
7262cc4c1a
Merge pull request #8836 from wy65701436/update-quota-error
...
Revise quota errors to make it more readable
2019-08-27 11:34:36 +08:00
Will Sun
c4baa75c9d
Merge pull request #8834 from AllForNothing/tag-imp
...
Improvement for rule validator of tag-retention
2019-08-27 10:45:10 +08:00
jwangyangls
86ae7d65e5
Merge pull request #8830 from jwangyangls/tag-detail-scan-show-result
...
Show the result about vulnerabilities number and vunerability list when click scan button
2019-08-27 10:23:55 +08:00
He Weiwei
1d8eac8cf4
fix(chart,quota): fix path regexp of chart creation and deletion
...
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-08-27 01:04:10 +00:00
wang yan
f343b2ec45
Revise quota errors to make it more readable
...
1, fix #8802 , update the error formet
2, fix #8807 , raise the real retag error to UI
3, fix #8832 , raise the real chart error to chart client & ut
Signed-off-by: wang yan <wangyan@vmware.com>
2019-08-26 17:00:31 +08:00
wang yan
e3155e00d6
fix #8815 :add remove untagged blob record in table project_blob
...
Signed-off-by: wang yan <wangyan@vmware.com>
2019-08-26 15:57:19 +08:00
Shijun Sun (c)
ab6232e2de
Improvement for rule validator of tag-retention UI and modify for errer message
...
Signed-off-by: Shijun Sun (c) <sshijun@vmware.com>
2019-08-26 15:33:15 +08:00
Yogi_Wang
b3341f3f8b
Show the result about vulnerabilities number and vunerability list when click scan button
...
we do not change the existing logic.
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-08-26 10:50:49 +08:00
Steven Zou
a80969e7af
fix rule logic bug described in #8817 ( #8818 )
...
Signed-off-by: Steven Zou <szou@vmware.com>
2019-08-23 18:49:44 +08:00
Ziming Zhang
52b9fbc8f3
fix tag retention model verify
...
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: Ifb237bbed4c6d7272ace62da7603e027c1481aef
2019-08-23 15:48:33 +08:00
Wang Yan
e7488e37b6
Merge pull request #8788 from bitsf/tag_retention_validate_model
...
add tag retention model test
2019-08-23 13:57:51 +08:00
Ziming Zhang
39db65e90f
add tag retention model test
...
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I3f8b06b994024fe6052b0dee87600ed932edaaff
2019-08-23 13:24:28 +08:00
mmpei
d5f87063e4
Merge branch 'master' into official-wehook-events-20190811
2019-08-22 22:07:12 -05:00
Wang Yan
35e786e54c
Merge pull request #8794 from ywk253100/190822_retry_status
...
Add status revision to retention task to handle retrying
2019-08-23 10:54:35 +08:00
jwangyangls
503f5352f0
Merge pull request #8760 from jwangyangls/revert-8494-fix-global-search
...
Revert "Fix redirect login page when enter harbor through global search"
2019-08-23 10:33:03 +08:00
jwangyangls
8dd7530280
Merge pull request #8800 from jwangyangls/pull-time-sort
...
Add the sortBy width push time and pull time of tags
2019-08-23 10:10:35 +08:00
peimingming
599d12a04d
Fix bugs by comments for webhook
...
Signed-off-by: peimingming <peimingming@corp.netease.com>
2019-08-23 09:44:51 +08:00
cd1989
4b59346423
Exist core when signal received
...
Signed-off-by: cd1989 <chende@caicloud.io>
2019-08-23 09:34:41 +08:00
Will Sun
713f0168f9
Merge pull request #8712 from tan-chao/master
...
fix chinese translation mistake #8426
2019-08-23 09:16:44 +08:00
Wang Yan
299032d602
Merge pull request #8771 from wy65701436/fix-manifest-dup
...
fix quota count size for same manifest in different repo
2019-08-23 08:37:03 +08:00
Yogi_Wang
26483836b3
Add the sortBy width push time and pull time of tags
...
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-08-23 07:34:46 +08:00
wang yan
2d569192ab
fix quota count size for same manifest in different repo
...
Signed-off-by: wang yan <wangyan@vmware.com>
2019-08-23 00:56:45 +08:00
Wang Yan
5488da1299
Merge pull request #8781 from BeHappyF/fix-8684
...
fix UI bug for Webhooks
2019-08-22 23:56:12 +08:00
Wang Yan
a4e2891e4d
Merge pull request #8792 from steven-zou/fix/issue-#8537
...
reduce the expire time of job stats in redis DB
2019-08-22 23:55:45 +08:00
He Weiwei
d6a6101fc2
fix(robot): make resource with projectId for robot in portal ( #8798 )
...
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-08-22 22:55:21 +08:00
Wenkai Yin
661470e7bc
Add status revision to retention task to handle retrying
...
Add status revision to retention task to handle retrying
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-08-22 20:04:25 +08:00
wang yan
83a3274a96
fix #8688
...
use the docker defined error to avoid retry pushing on quota overflow
Signed-off-by: wang yan <wangyan@vmware.com>
2019-08-22 19:19:43 +08:00
Steven Zou
718e336302
reduce the expire time of job stats in redis DB
...
Signed-off-by: Steven Zou <szou@vmware.com>
2019-08-22 18:26:09 +08:00
Wenkai Yin(尹文开)
21f8290110
Merge pull request #8777 from heww/issue-8635
...
fix(rbac): NewProjectNamespace in rbac only accept projectID
2019-08-22 17:52:27 +08:00
Wang Yan
371a306dcf
Merge pull request #8784 from wy65701436/fix-migrator
...
fix deleted project error when to migrate quota
2019-08-22 16:34:49 +08:00
He Weiwei
311028be37
test: fix TestIsNegative ( #8783 )
...
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-08-22 15:27:49 +08:00
wang yan
dfa4301b21
fix deleted project error when to migrate quota
...
Signed-off-by: wang yan <wangyan@vmware.com>
2019-08-22 14:51:26 +08:00
Wenkai Yin(尹文开)
6198ed2634
Merge pull request #8758 from heww/issue-8681
...
refactor(quota,middleware): skip overflow error when subtract resources
2019-08-22 13:54:01 +08:00
Will Sun
5b9fcf28b0
Merge pull request #8779 from AllForNothing/tag-re
...
modify metadate of tag-retention
2019-08-22 12:57:00 +08:00
方彬
088f805753
fix UI bug for Webhooks
...
Signed-off-by: 方彬 <fang_bingo@163.com>
2019-08-22 12:00:43 +08:00
Steven Zou
dfdcb3c9cb
Merge pull request #8763 from bitsf/tag_retention_rule_order
...
remove rule none and change rule order
2019-08-22 11:58:15 +08:00
Wenkai Yin(尹文开)
e3d8fa845d
Merge pull request #8767 from steven-zou/fix/issue-#8525
...
fix #8525 : periodic job retry issue: job stats are not found
2019-08-22 11:06:13 +08:00
AllForNothing
ec459e20ce
modify metadate of tag-retention
...
Signed-off-by: AllForNothing <sshijun@vmware.com>
2019-08-22 10:09:50 +08:00
He Weiwei
8effdc6f18
fix(rbac): NewProjectNamespace in rbac only accept projectID
...
Closes #8635
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-08-21 19:37:28 +00:00
Ziming Zhang
06e9467b06
1. remove rule none
...
2. change rule orders
3. remove laber selector
Change-Id: Idc18a27cb0267f5f5c80a04b381e4a5dc6998508
Signed-off-by: Ziming Zhang <zziming@vmware.com>
2019-08-21 20:24:33 +08:00
Will Sun
427a369d3a
Merge pull request #8764 from goharbor/ui-modify
...
ui adjustment for tag-retention and webhook
2019-08-21 18:39:25 +08:00
wang yan
e91ded65cb
fix quota size usage in gc job, issue # https://github.com/goharbor/harbor/issues/8699
...
Signed-off-by: wang yan <wangyan@vmware.com>
2019-08-21 16:51:31 +08:00
Steven Zou
926ac44a67
fix #8525 : periodic job retry issue: job stats is not found
...
Signed-off-by: Steven Zou <szou@vmware.com>
2019-08-21 16:30:47 +08:00
AllForNothing
e0b73f2729
ui adjustment for tag-retention and webhook
...
Signed-off-by: AllForNothing <sshijun@vmware.com>
2019-08-21 15:35:44 +08:00
Wang Yan
c1ad0518c9
Merge pull request #8582 from ethan-daocloud/patch-1
...
core/main.go: logging message correction
2019-08-21 13:49:00 +08:00
Wang Yan
4bccb17236
Merge pull request #8749 from heww/issue-8493
...
fix(quota-driver): owner name of project quota reference object
2019-08-21 13:47:17 +08:00
jwangyangls
cd6d3ec800
Revert "Fix redirect login page when enter harbor through global search"
...
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-08-21 11:37:27 +08:00
jwangyangls
8701007714
Merge pull request #8738 from jwangyangls/fix-error
...
Fix error in Harbor
2019-08-21 11:02:00 +08:00
928234269
7a4fde5ec9
fixt typo "an user" to "a user"
...
Signed-off-by: 928234269 <longfei.shang@daocloud.io>
2019-08-21 10:20:35 +08:00
Daniel Jiang
67077297b1
Merge pull request #7998 from dorukhanguloz/master
...
Add Turkish Language
2019-08-21 00:02:21 +08:00
He Weiwei
c22bf2539e
refactor(quota,middleware): skip overflow error when subtract resources
...
1. Skip overflow error when subtract resources
2. Take up resources before handle request and put it back when handle
failed for add action in quota interceptor
3. Free resources only after handle success for subtract action in quota
interceptor
Closes #8681
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-08-20 14:41:55 +00:00
Dorukhan Gülöz
5307e1398d
Add Turkish Language
...
Signed-off-by: dorukhanguloz dorukhanguloz@hotmail.com
Signed-off-by: Dorukhan Gülöz <dguloz@havelsan.com.tr>
2019-08-20 13:58:25 +02:00
Wenkai Yin(尹文开)
f9aa154826
Merge pull request #8751 from steven-zou/fix/#8745
...
fix #8745 : job retry issue
2019-08-20 19:01:30 +08:00
Dorukhan Gülöz
7d63620d42
Merge branch 'master' into master
2019-08-20 12:16:10 +02:00
Petr Ruzicka
d0692fcaa2
Typo fix in en-us-lang.json "Creat" -> "Create"
...
Signed-off-by: Petr Ruzicka <petr.ruzicka@gmail.com>
2019-08-20 11:25:29 +02:00
cd1989
db9b52d827
Config idle timeout for redis pool
...
Signed-off-by: cd1989 <chende@caicloud.io>
2019-08-20 17:23:32 +08:00
Steven Zou
217252a097
Merge pull request #8675 from ywk253100/190814_retention_task
...
Handle the retention task status updating in concurrency
2019-08-20 17:07:21 +08:00
Steven Zou
f6067d5474
Merge pull request #8708 from bitsf/tag_retention_rule_conflict
...
fix rule conflict, id error
2019-08-20 16:45:21 +08:00
Steven Zou
ace07b0c0a
fix #8745 : job retry issue
...
Signed-off-by: Steven Zou <szou@vmware.com>
2019-08-20 16:39:44 +08:00
He Weiwei
8eb17be13c
fix(quota-driver): owner name of project quota reference object
...
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-08-20 07:03:11 +00:00
Wang Yan
92fa01d6cd
Merge pull request #8733 from ywk253100/190819_label
...
Fix bug of listing tags filtered by label
2019-08-20 14:17:41 +08:00
Wenkai Yin(尹文开)
29ab93ad9c
Merge pull request #8714 from ywk253100/190816_scheduler
...
Fix bug found in scheduler
2019-08-20 14:11:04 +08:00
Wenkai Yin(尹文开)
0086d1b211
Merge pull request #8586 from ethan-daocloud/patch-2
...
project_test.go: many typos "respose" fixup
2019-08-20 13:54:37 +08:00
jwangyangls
596f299743
Merge pull request #8739 from AllForNothing/cve-add-id
...
add ids to key elements of CVE-whitelist UI for easy test
2019-08-20 13:51:24 +08:00
stonezdj(Daojun Zhang)
4384e11422
Merge pull request #8648 from stonezdj/regular_filter
...
Normalize LDAP filter for user filter and group filter
2019-08-20 13:47:32 +08:00
Wang Yan
f930786050
Merge pull request #8725 from heww/issue-8701
...
fix(quota): fix computeResources method of qutoa interceptor
2019-08-20 11:29:59 +08:00
Daniel Jiang
4921b0fb4c
Merge pull request #8494 from jwangyangls/fix-global-search
...
Fix redirect login page when enter harbor through global search
2019-08-20 11:22:21 +08:00
stonezdj
7c7b6d2710
Normalize LDAP filter for user filter and group filter
...
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-08-20 10:55:30 +08:00
Will Sun
c9f12bc273
Merge pull request #8727 from AllForNothing/tag-retention-bug
...
fix bugs for tag-retention
2019-08-20 10:46:53 +08:00
AllForNothing
88f1e198aa
1.add ids to key elements of CVE-whitelist UI for easy test
...
2.change decrible in UI
Signed-off-by: AllForNothing <sshijun@vmware.com>
2019-08-20 10:18:31 +08:00
Daniel Jiang
f10fb67d6d
Merge pull request #8662 from stonezdj/email_sec2
...
Set default email to null if not provided
2019-08-20 09:01:50 +08:00
He Weiwei
75772aae11
refactor(quota): new error types for quota checking ( #8726 )
...
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-08-19 19:00:29 +08:00
Yogi_Wang
2134492587
Fix error in Harbor
...
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-08-19 18:08:19 +08:00
Wenkai Yin
a5d292c9c6
Fix bug of listing tags filtered by label
...
Fixes #8249
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-08-19 16:10:16 +08:00
Will Sun
c0497c1a8d
Merge pull request #8730 from AllForNothing/webhook-bug
...
fix UI bugs for Webhooks
2019-08-19 15:59:10 +08:00
Will Sun
786fb429d6
Merge pull request #8716 from AllForNothing/cve-bug
...
fix cve-whitelist bugs
2019-08-19 15:55:24 +08:00
AllForNothing
6f3cc0da20
fix bugs for tag-retention
...
Signed-off-by: AllForNothing <sshijun@vmware.com>
2019-08-19 15:51:30 +08:00
stonezdj
5fa8eb7854
Set default email to null if not provided
...
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-08-19 15:20:44 +08:00
AllForNothing
f11d4922d5
fix UI bugs for Webhooks
...
Signed-off-by: AllForNothing <sshijun@vmware.com>
2019-08-19 14:41:28 +08:00
AllForNothing
a8f773e678
fix cve-whitelist bugs
...
Signed-off-by: AllForNothing <sshijun@vmware.com>
2019-08-19 13:40:09 +08:00
Ziming
0c79352c9c
fix tag retention schedule none error ( #8715 )
...
Change-Id: I04cad9d4c520db751bfa413bb139317563716501
Signed-off-by: Ziming Zhang <zziming@vmware.com>
2019-08-19 12:25:54 +08:00
jwangyangls
94c930f150
Merge pull request #8720 from jwangyangls/fix-quota-bug
...
Fix bug for harbor 1.9.0
2019-08-19 11:20:25 +08:00
Yogi_Wang
48cb2da09b
Fix bug for harbor 1.9.0
...
1.modify the quota message.
2.fix replication ng bug when no filter.
3.fix summary ui style.
4.fix quota-edit page validation when input a large number
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-08-19 10:38:19 +08:00
Daniel Jiang
b3abd0316b
Merge pull request #8713 from reasonerjt/fix-8702
...
Avoid overwriting system CVE whitelist by mistake
2019-08-19 01:42:58 +08:00
He Weiwei
1bbfc023f1
fix(quota): fix computeResources method of qutoa interceptor
...
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-08-18 16:14:36 +00:00
Daniel Jiang
504202ecfd
Merge pull request #8378 from Typositoire/ldap/nested-groups
...
Search for LDAP_MATCHING_RULE_IN_CHAIN groups
2019-08-18 16:07:16 +08:00
wang yan
b9d6108624
add ping for adapter to wait for service ready
...
Signed-off-by: wang yan <wangyan@vmware.com>
2019-08-16 16:03:12 +08:00
wang yan
6e11ecc6fc
Update codes per review comments
...
Signed-off-by: wang yan <wangyan@vmware.com>
2019-08-16 14:58:52 +08:00
Wang Yan
7a41d89ac8
Add quota sync api toi to sync quota data with backend storage
...
Signed-off-by: wang yan <wangyan@vmware.com>
2019-08-16 14:55:46 +08:00
Daniel Jiang
022d4e6ae8
Merge pull request #7462 from cd1989/enable-tags-detail-param
...
List simple tags when detail set to false
2019-08-16 14:25:29 +08:00
Wenkai Yin
5c286d799f
Fix bug found in scheduler
...
The scheduler hook handler doesn't parse the job status struct when handling the hook. This commit fixes it.
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-08-16 13:54:57 +08:00
Daniel Jiang
30bb2ddcdf
Avoid overwriting system CVE whitelist by mistake
...
Fixes #8702
Also enforce the code to mitigate the potential risk.
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-08-16 13:28:16 +08:00
Tan Chao
39b939b329
merge from upstream
2019-08-16 09:42:52 +08:00
Tan Chao
4e0e9d26cc
fix chinese translation mistake
...
Signed-off-by: Tan Chao <tanchao.org@gmail.com>
2019-08-16 09:31:07 +08:00
Ziming
c279b7f3e9
fix retention rule compute error ( #8664 )
...
Change-Id: I16d7284b17508885e136f2d9ea5651978ba4a6d8
Signed-off-by: Ziming Zhang <zziming@vmware.com>
2019-08-15 20:12:59 +08:00
Ziming Zhang
4dc6f12784
fix rule conflict, id error
...
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I379f3c29cee742d346fb57ade397be64fd76f59d
2019-08-15 20:11:30 +08:00
Wenkai Yin
48b067f596
Handle the retention task status updating in concurrency
...
Compare the status code when updating retention task status to avoid the concurrent issue
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-08-15 18:36:18 +08:00
Ziming Zhang
f854d4a25d
add always rule again
...
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I34bac3b73e693b89e0b9debb28617352656ed1d9
2019-08-15 15:26:22 +08:00
Ziming
4944799f70
Merge pull request #8651 from bitsf/remove_tagretention_always
...
remove tag retention rule always
2019-08-15 14:35:26 +08:00
jwangyangls
0b393554b8
Merge pull request #8660 from jwangyangls/fix-bug-delete-image-scan-trigger-log-refresh
...
Fix scan is repeatedly triggered and refresh Logs failed
2019-08-15 12:46:05 +08:00
Qian Deng
89aed1a1ea
Merge pull request #8672 from ywk253100/190815_content_length
...
Set content length when pushing blobs
2019-08-15 12:45:35 +08:00
Yogi_Wang
3086a3eeb6
Fix scan is repeatedly triggered and refresh Logs failed/ init time not available
...
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-08-15 11:38:31 +08:00
Wenkai Yin
b94a99dded
Set content length when pushing blobs
...
Set content length when pushing blobs
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-08-15 10:52:08 +08:00
Wang Yan
bf0b5a3fd0
Merge pull request #8663 from wy65701436/fix-quota-api
...
Fix quota switch fail to get project size
2019-08-15 10:49:49 +08:00
Wenkai Yin(尹文开)
8ccac663b1
Merge pull request #8661 from ywk253100/190814_dockerhub_adapter
...
Fix bug in native replication adapter
2019-08-15 10:21:19 +08:00
Qian Deng
4611630ab6
Merge pull request #8616 from heww/db-connection-pool
...
feat(configuration,db): connection pool configs for db
2019-08-15 09:48:20 +08:00
Daniel Jiang
b0c8561b54
Merge pull request #8189 from mmpei/8162-optimize-manifest-wait
...
Optimize fetch manifest loop when handling notification
2019-08-15 00:29:53 +08:00
Daniel Jiang
d9e1b90c5b
Merge pull request #8653 from vmlaguna/vmlaguna/template-fix
...
Close <a> tag in error template
2019-08-15 00:11:28 +08:00
wang yan
a947a4259d
Fix quota switch fail to get project size
...
Signed-off-by: wang yan <wangyan@vmware.com>
2019-08-14 22:32:32 +08:00
Wenkai Yin
2a57424f9d
Fix bug in native replication adapter
...
Use the stardard token authentication work flow even though the credentail isn't provided
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-08-14 18:17:38 +08:00
Wang Yan
54cb39b7a7
Merge pull request #8655 from wy65701436/log-size
...
Add log in quota size handler
2019-08-14 16:09:45 +08:00
Pedro Laguna
3c34675e0f
Close <a> tag in error template
...
The error template is missing a closing <a> tag in the link to the harbor portal.
Signed-off-by: Pedro Laguna <44469313+vmlaguna@users.noreply.github.com>
2019-08-14 08:37:44 +01:00
He Weiwei
98e1f68468
feat(configuration,db): connection pool configs for db
...
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-08-14 14:30:34 +08:00
wang yan
9601c9f206
Add log in quota size handler
...
Signed-off-by: wang yan <wangyan@vmware.com>
2019-08-14 14:10:09 +08:00
Wang Yan
c252ca0b74
Merge pull request #8645 from wy65701436/quota-switch-api
...
Enable usage sync when switch quota setting
2019-08-14 13:48:33 +08:00
jwangyangls
b2b5d74456
Merge pull request #8623 from jwangyangls/replication-task-paging
...
Add paging from backend in replication task ui
2019-08-14 13:08:38 +08:00
wang yan
838a923d23
fix code by review
...
Signed-off-by: wang yan <wangyan@vmware.com>
2019-08-14 12:47:12 +08:00
wang yan
9e0addee55
Enable usage sync when switch quota setting
...
Signed-off-by: wang yan <wangyan@vmware.com>
2019-08-14 12:47:12 +08:00
jwangyangls
679bab9f80
Merge pull request #8638 from jwangyangls/quota-color-yellow
...
Add the warning color in quota when used/hard >0.7
2019-08-14 12:28:38 +08:00
wang yan
76c52c2332
append commit to fix core compile error introduced by pr #8606
...
Signed-off-by: wang yan <wangyan@vmware.com>
Signed-off-by: wang yan <wangyan@vmware.com>
2019-08-14 00:22:55 +08:00
Ziming Zhang
d7e9924a01
remove tag retention rule always
...
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: Ide98d58f64596e8110fbb9eb0d73df6ccbd99c80
2019-08-13 21:10:57 +08:00
Steven Zou
1adc3a9469
Merge pull request #8606 from ywk253100/190807_stuck
...
Fix replication tasks stuck in "InProgress" issue
2019-08-13 15:59:20 +08:00
stonezdj(Daojun Zhang)
3e0191be5a
Merge pull request #8621 from stonezdj/project_sort
...
Sort project by name
2019-08-13 14:13:29 +08:00
Wang Yan
2a3192b5c1
Merge pull request #8633 from heww/quota-switch
...
feat(quota,middleware): enable or disable quota per project by config
2019-08-12 19:36:38 +08:00
Wenkai Yin(尹文开)
34f845b804
Merge pull request #8594 from ywk253100/190731_replicate_chart
...
Fix bug in Helm Hub and Harbor adapter for replicating chart
2019-08-12 17:48:11 +08:00
Yogi_Wang
bf55c37956
Add the warning color in quota when used/hard >0.7
...
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-08-12 17:36:38 +08:00
Wenkai Yin(尹文开)
67a60df033
Merge pull request #8609 from ywk253100/190808_replicate_meta
...
Only replicate "public" metadata when creating project in Harbor
2019-08-12 17:31:02 +08:00
cd1989
da370bb331
List simple tags when detail set to false
...
Signed-off-by: cd1989 <chende@caicloud.io>
2019-08-12 15:16:19 +08:00
jwangyangls
fd6a422bf8
Merge pull request #8605 from jwangyangls/fix-Link-to-license-hardcoded
...
Fix issue width Link to license in the about dialog should not be hardcoded to master
2019-08-12 10:50:18 +08:00
Yogi_Wang
1530aa119a
Add paging from backend in replication task ui
...
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-08-12 10:47:29 +08:00
He Weiwei
c1cea42089
feat(quota,middleware): enable or disable quota per project by config
...
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-08-12 00:02:26 +00:00
peimingming
222c47142a
Add chart and scanning event for webhook
...
Signed-off-by: peimingming <peimingming@corp.netease.com>
2019-08-11 18:01:07 +08:00
Wang Yan
d663796b3d
Merge pull request #8612 from BeHappyF/webhook-dev-ui
...
Add webhook UI
2019-08-10 20:03:15 +08:00
方彬
44ca591582
Add webhook UI
...
Signed-off-by: 方彬 <fang_bingo@163.com>
2019-08-09 20:18:08 +08:00
jwangyangls
cc51703cf0
Merge pull request #8618 from jwangyangls/replication-task
...
Add pull-time and push time in repositories image
2019-08-09 17:59:47 +08:00
stonezdj
65dc665717
Sort project by name
...
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-08-09 16:22:55 +08:00
Wang Yan
54a39c7159
Merge pull request #8597 from heww/size-quota
...
refactor(quota,middleware): implement size quota by quota interceptor
2019-08-09 15:44:33 +08:00
Steven Zou
d2fbb98a8d
Merge pull request #8592 from bitsf/tag_retention_conflict_rule
...
check rule conflict
2019-08-09 13:59:46 +08:00
Yogi_Wang
53bd4d7897
Fix issue width Link to license in the about dialog should not be hardcoded to master
...
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-08-09 13:26:43 +08:00
Yogi_Wang
b66c5d05cd
Add pull-time and push time in repositories image
...
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-08-09 12:51:54 +08:00
jwangyangls
4dce75c25e
Merge pull request #8318 from JakubOnderka/patch-1
...
Fixed typo in en-us-lang.json
2019-08-09 12:06:19 +08:00
He Weiwei
e62c29123d
refactor(quota,middleware): implement size quota by quota interceptor
...
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-08-08 23:55:54 +00:00
Wenkai Yin
96a1ad89fa
Only replicate "public" metadata when creating project in Harbor
...
This commit filters the metadata when creating project in replication to avoid replicate unnecessary properties, such as retention policy
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-08-08 16:19:09 +08:00
Wang Yan
9cbcc93e8a
Merge pull request #8602 from goharbor/webhook-dev-20190807
...
Add feature webhook implementation
2019-08-08 16:01:39 +08:00
Wenkai Yin
8777c07d47
Fix replication tasks stuck in "InProgress" issue
...
Fix replication tasks stuck in "InProgress" issue
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-08-08 15:42:42 +08:00
Ziming Zhang
fb5acdc64b
check rule conflict
...
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: Iea8c9ff4702873cb4ab3ebd943deec22bec418e6
Signed-off-by: Ziming Zhang <zziming@vmware.com>
2019-08-08 14:23:53 +08:00
Wenkai Yin
b7b8332626
replication helm hub adapter bug fix
...
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-08-08 14:14:00 +08:00
Will Sun
b364ad89ae
Merge pull request #8591 from AllForNothing/translate
...
fix issue and add new templats for tag-retention
2019-08-08 09:59:58 +08:00
Wenkai Yin(尹文开)
4add0eaba8
Merge pull request #8514 from cd1989/replication-performance
...
Replication performance
2019-08-08 06:27:47 +08:00
Yann David
6435f32bc5
Prevent duplicated entries
...
Signed-off-by: Yann David <davidyann88@gmail.com>
2019-08-07 13:16:43 -04:00
王添
94d4f9c6b6
add webhook job
...
Signed-off-by: 王添 <wangtian@corp.netease.com>
2019-08-07 20:56:31 +08:00
guanxiatao
e7fafd1941
webhook policy, job, event support
...
Signed-off-by: guanxiatao <guanxiatao@corp.netease.com>
2019-08-07 20:30:26 +08:00
Ziming Zhang
730d95edc8
check rule conflict
...
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I95f7e683b30fa6059b5bb49a2fc8f78dd7276079
2019-08-07 17:52:47 +08:00
Steven Zou
f3ba25f656
Merge pull request #8536 from bitsf/tag_retention_task_num
...
add task retain num
2019-08-07 17:39:39 +08:00
cd1989
870d7115c4
Refactor code to extract a common task runner
...
Signed-off-by: cd1989 <chende@caicloud.io>
2019-08-07 17:14:10 +08:00
cd1989
e2e540233b
Use context for concurrency control
...
Signed-off-by: cd1989 <chende@caicloud.io>
2019-08-07 17:14:10 +08:00
cd1989
1f541c890c
Improve performance for other registry adapters
...
Signed-off-by: cd1989 <chende@caicloud.io>
2019-08-07 17:14:10 +08:00
cd1989
254aa7e2b7
Fix DockerHub adapter registry URL problem
...
Signed-off-by: cd1989 <chende@caicloud.io>
2019-08-07 17:14:10 +08:00
cd1989
5f29d9a3b7
Improve DockerHub adapter performance
...
Signed-off-by: cd1989 <chende@caicloud.io>
2019-08-07 17:14:10 +08:00
Will Sun
8ae1fe4726
Merge pull request #8574 from AllForNothing/trim
...
Removal of leading white space
2019-08-07 16:58:14 +08:00
AllForNothing
af49a6999c
fix issue and add new templats for tag-retention
...
Signed-off-by: AllForNothing <sshijun@vmware.com>
2019-08-07 15:50:25 +08:00
Ziming Zhang
3b62addc76
check rule conflict
...
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I8af648f22aa3fe76024240d322a7fdae560e3fbd
2019-08-07 15:38:21 +08:00
Steven Zou
53dfd6a5e3
Merge pull request #8576 from ywk253100/190806_repo_size
...
Fixes #8281 , only show one tag in the task list to decrease the length of string
2019-08-07 14:34:20 +08:00
ethan
f463b7c449
project_test.go: many typos "respose" fixup
...
Signed-off-by: Guangming Wang <guangming.wang@daocloud.io>
2019-08-07 13:39:05 +08:00
Wenkai Yin(尹文开)
6c0c75743e
Merge pull request #8571 from ywk253100/190806_retention_time
...
Populate pull/push time properties to the returning data when listing tags
2019-08-07 12:41:23 +08:00
Wang Yan
305242e993
Merge pull request #8573 from stonezdj/change_trace_level
...
Change trace level of missing configure metadata
2019-08-07 12:41:00 +08:00
Wenkai Yin
e0fac5b61a
Fixes #8281 , only show one tag in the task list to decrease the length of string
...
Fixes #8281 , only show one tag in the task list to decrease the length of string to avoid exceeding the limit in database
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-08-07 11:47:49 +08:00
Wenkai Yin
216ef269b3
Populate pull/push time properties to the returning data when listing tags
...
Populate pull/push time properties to the returning data when listing tags
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-08-07 11:47:05 +08:00
Wenkai Yin(尹文开)
556e07f0c4
Merge pull request #8551 from nlowe/feat/retention/GH-8548-Pulled-in-the-last-N-Days
...
Retention: New Evaluator: Pulled within the last N Days
2019-08-07 11:37:46 +08:00
Wang Yan
0bbd17388e
Merge pull request #8575 from ywk253100/190806_jobservice
...
Ignore the arguments when logging the job detail
2019-08-07 11:07:10 +08:00
Wenkai Yin(尹文开)
a00b1aab8d
Merge pull request #8581 from ywk253100/190806_retention_disable_chart
...
Comment the related code for chart retention
2019-08-07 11:04:43 +08:00
Qian Deng
635066da92
Merge pull request #8466 from reasonerjt/remove-clair-notification
...
Remove clair notifier
2019-08-07 10:53:35 +08:00
Nathan Lowe
9a7df265ce
Retention: New Evaluator: Pulled within the last N Days
...
Signed-off-by: Nathan Lowe <public@nlowe.me>
2019-08-06 22:28:28 -04:00
Wenkai Yin(尹文开)
ec4fa753d7
Merge pull request #8552 from nlowe/feat/retention/GH-8549-Pushed-in-the-last-N-Days
...
Retention: New Evaluator: Retain Images pushed within N days
2019-08-07 09:55:05 +08:00
ethan
edd102c3b7
core/main.go: logging message correction
...
Signed-off-by: ethan <guangming.wang@daocloud.io>
2019-08-06 21:56:18 +08:00
Steven Zou
bbc7d1cb24
Merge pull request #8562 from bitsf/tag_retention_nothing_rule
...
retain nothing rule
2019-08-06 20:15:19 +08:00
Steven Zou
92c2cfa35a
Merge pull request #8529 from bitsf/tag_retention_disable_rule
...
add disable rule feature for tag retention
2019-08-06 20:05:28 +08:00
Wenkai Yin
0ac4ae687d
Comment the related code for chart retention
...
As we don't provide the capability for chart rerention currently, this commit comments related code
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-08-06 19:07:38 +08:00
Ziming Zhang
498a813299
retain nothing rule
...
Change-Id: I4e7a4ecb40fe39b80e41a6d9bf8b5fb3968a41af
Signed-off-by: Ziming Zhang <zziming@vmware.com>
2019-08-06 15:10:27 +08:00
Ziming Zhang
57e7854beb
add disable rule feature for tag retention
...
Change-Id: I335f1fb3e1273c945dda85999a0218440092be12
Signed-off-by: Ziming Zhang <zziming@vmware.com>
2019-08-06 15:05:20 +08:00
Wenkai Yin
8325f0769f
Ignore the arguments when logging the job detail
...
As the arguments of a job may contain sensitive information, ignore them when logging the job detail. Fixes #8404
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-08-06 15:02:14 +08:00
AllForNothing
2ddcab4212
Removal of leading white space
...
Signed-off-by: AllForNothing <sshijun@vmware.com>
2019-08-06 14:19:30 +08:00
stonezdj
05f9920e62
Change trace level of missing metadata
...
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-08-06 14:09:54 +08:00
Nathan Lowe
0db203a395
Fix failing test for the index
...
Signed-off-by: Nathan Lowe <public@nlowe.me>
2019-08-05 23:56:15 -04:00
Nathan Lowe
756352d271
Add metadata for daysps to the API for the UI
...
Signed-off-by: Nathan Lowe <public@nlowe.me>
2019-08-05 20:08:34 -04:00
Nathan Lowe
9f88e78381
Register the new evaluator with the index package
...
Signed-off-by: Nathan Lowe <public@nlowe.me>
2019-08-05 20:05:33 -04:00
Daniel Jiang
eec4fc2798
Remove clair notifier
...
The way Harbor handles notification is problematic.
It currently triggers rescan, which will cause problem when there are
lot of images in the registry.
Such as #7316
This commit removes the notifier and we need to revisit the notification
to figure out how to map the notification to a particular image if need
the notification mechanism in future.
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-08-06 01:58:15 +08:00
Ziming Zhang
3a80123a82
1. remove rule always
...
2. update i18n
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I0e2394f0a6b283d0efef7a44ed2d4afb9745eabd
2019-08-05 17:59:00 +08:00
Ziming Zhang
026aee75d9
add task retain num
...
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I2f8b89454fe3bb9b56af237048c9e2b90783f434
Signed-off-by: Ziming Zhang <zziming@vmware.com>
2019-08-05 17:57:09 +08:00
stonezdj(Daojun Zhang)
12fb643f0a
Merge pull request #8557 from stonezdj/merge_user_group_roles
...
Merge user roles and group roles
2019-08-05 17:07:35 +08:00
stonezdj
35a49568ce
Merge user roles and group roles
...
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-08-05 15:10:06 +08:00
Will Sun
4f3e2b20c9
Merge pull request #8535 from AllForNothing/tag-mo
...
Modify tag-retention UI
2019-08-05 15:01:04 +08:00
Steven Zou
97c812a1e8
Merge pull request #8359 from nlowe/bugfix/logging-line-call-outside-repo-root
...
Fix logger line() call if built outside of the repo root
2019-08-05 14:49:06 +08:00
AllForNothing
beed897170
Modify tag-retention UI
...
Signed-off-by: AllForNothing <sshijun@vmware.com>
2019-08-05 13:04:08 +08:00
Nathan Lowe
14eff4d9f2
Add comment to make the linter happy
...
Signed-off-by: Nathan Lowe <public@nlowe.me>
2019-08-05 00:30:29 -04:00
Nathan Lowe
71ada8b21d
Retention: New Evaluator: Retain Images pushed within N days
...
Signed-off-by: Nathan Lowe <public@nlowe.me>
2019-08-04 20:12:38 -04:00
Will Sun
6cd79218b3
Merge pull request #8533 from AllForNothing/user-ui-paging
...
Change userList paging from "by frontend" to "by backend"
2019-08-02 18:49:35 +08:00
Steven Zou
3b45840bb0
Merge pull request #8544 from bitsf/tag_retention_fix_pagenum
...
add total page num for tag retention
2019-08-02 18:18:21 +08:00
AllForNothing
2f3b4f0933
paging user by server for userList UI
...
Signed-off-by: AllForNothing <sshijun@vmware.com>
2019-08-02 17:54:18 +08:00
Wenkai Yin(尹文开)
27245021d3
Merge pull request #8500 from steven-zou/fix/pool_run_out
...
fix bug #8499 : redis connection pool is run out
2019-08-02 17:47:26 +08:00
Steven Zou
93070067be
Merge pull request #8541 from ywk253100/190802_retention_repo
...
Remove the retention job for deleting repository
2019-08-02 15:45:39 +08:00
jwangyangls
6cf91717cd
Merge pull request #8542 from jwangyangls/fix-warning
...
Fix the part of warnings when ng build
2019-08-02 15:16:57 +08:00
Ziming Zhang
decffdd6a4
add total page num for tag retention
...
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I58a250dbb643f6949c1e34aa3a84a01dc3e0b285
2019-08-02 14:43:52 +08:00
Wang Yan
7c3858f28c
Merge pull request #8508 from heww/image-count-quota
...
feat(quota,middleware): image count quota support
2019-08-02 13:24:36 +08:00
Yogi_Wang
07ca964071
Fix the part of warnings when ng build
...
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-08-02 11:14:11 +08:00
Wenkai Yin
1aa5e631d7
Remove the retention job for deleting repository
...
Remove the retention job for deleting repository
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-08-02 10:27:19 +08:00
Yogi_Wang
1ac60c2153
Add download button that it can download the message of robot to local file when click it
...
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-08-01 16:43:03 +08:00
He Weiwei
9778954852
feat(quota,middleware): image count quota support
...
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-08-01 14:48:59 +08:00
Steven Zou
75707adeb9
Merge pull request #8509 from ywk253100/190731_retention
...
Fix retention bug
Urgent case, need to merge now
2019-07-31 20:33:37 +08:00
Wenkai Yin
05934d1818
Fix retention bug
...
Fix retention bug that passing the wrong rules to retention job
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-07-31 19:53:04 +08:00
Steven Zou
35f71d1bc6
Merge pull request #8505 from steven-zou/fix/retention_bug_dryrun
...
fix bug: dry run is missing when deleting ropo
2019-07-31 18:40:22 +08:00
AllForNothing
d90513ff1a
fix bug for tag-retention
...
Signed-off-by: AllForNothing <sshijun@vmware.com>
2019-07-31 17:43:07 +08:00
Steven Zou
49c1b2d4f1
fix bug: dry run is missing when deleting ropo
...
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-31 17:14:08 +08:00
He Weiwei
8cc9314984
feat(helm-chart,quota): count quota support for helm chart ( #8439 )
...
* feat(helm-chart,quota): count quota support for helm chart
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-07-31 16:48:40 +08:00
jwangyangls
270f9ea213
Merge pull request #8443 from jwangyangls/fix-many-issue
...
Fix many issue for harbor for ui
2019-07-31 16:00:37 +08:00
Steven Zou
3a68bd7aa2
fix bug #8499 : redis connection pool is run out
...
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-31 15:45:03 +08:00
Will Sun
ec30def94b
Merge pull request #8492 from AllForNothing/opt
...
Optimization for tag-retention UI
2019-07-31 14:45:06 +08:00
jwangyangls
b64532bf09
Merge pull request #8495 from jwangyangls/fix-translate-quota
...
Fix the translate text of quota
2019-07-31 13:30:48 +08:00
Shijun Sun (c)
cb6a426c7d
Optimization for tag-retention UI
...
Signed-off-by: Shijun Sun (c) <sshijun@vmware.com>
2019-07-31 13:29:10 +08:00
Steven Zou
a63d3b91e3
Merge pull request #8487 from bitsf/tag_retention_fix
...
fix tag_retention bug
2019-07-30 22:35:07 +08:00
Wang Yan
0a92e61d97
Merge pull request #8485 from wy65701436/internal-reg-quota
...
add internal reg request handler chain
2019-07-30 20:47:21 +08:00
wang yan
4410cc93f9
add internal reg request handler chain
...
this is for internal registry api call, the request should be intercpeted by quota middlerwares, like retag and delete.
Note: The api developer has to know that if the internal registry call in your api, please consider to use
NewRepositoryClientForLocal() to init the repository client, which can handle quota change.
Signed-off-by: wang yan <wangyan@vmware.com>
2019-07-30 19:39:56 +08:00
Ziming Zhang
98994ce459
fix tag_retention bug
...
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I8e645c351817afede442a1bf29dd7ad6da31ad06
2019-07-30 19:03:39 +08:00
Yogi_Wang
5d9632549b
Fix the translate text of quota
...
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-07-30 18:31:04 +08:00
Wenkai Yin(尹文开)
eb69ae98eb
Merge pull request #8488 from ywk253100/190730_launcher
...
Refactor retention launcher
2019-07-30 18:07:40 +08:00
Yogi_Wang
106de5cc0e
Fix redirect login page when enter harbor through global search
...
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-07-30 17:50:48 +08:00
Wenkai Yin
6464dcbd51
Register the replication adapter for Helm Hub
...
Register the replication adapter for Helm Hub
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-07-30 16:28:06 +08:00
Wenkai Yin
61f54cc4a9
Refactor retention launcher
...
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-07-30 16:10:33 +08:00
Will Sun
4a4de4a9c1
Merge pull request #8480 from AllForNothing/Test-refactor
...
modify spec.ts file for project-policy-config.component.ts
2019-07-30 16:00:14 +08:00
Wenkai Yin(尹文开)
9e6b022ce1
Merge pull request #8425 from ywk253100/190726_acr
...
Fix #8319 , got error when replicating image with Azure container registry
2019-07-30 15:19:12 +08:00
Yogi_Wang
4adc94762d
Fix many issue for harbor for ui
...
1.filter input auto focus
2.filter is covered by datagrid
3.modify elements of click action in label
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-07-30 14:52:54 +08:00
Steven Zou
63d16d4b6b
Merge pull request #8475 from steven-zou/fix/add_del_job
...
add retention job for deleting repository
2019-07-30 14:19:46 +08:00
Wenkai Yin
4dac036013
Fix #8319 , got error when replicating image with Azure container registry
...
Fix #8319 , got error when replicating image with Azure container registry
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-07-30 12:58:22 +08:00
Shijun Sun (c)
3ab9cdec74
modify spec.ts file for project-policy-config.component.ts
...
Signed-off-by: Shijun Sun (c)<sshijun@vmware.com>
2019-07-30 12:05:27 +08:00
Steven Zou
f29d50e6dd
fix ut case failures
...
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-30 11:56:17 +08:00
Steven Zou
dcc79ca2a4
Merge pull request #8392 from AllForNothing/tag-retention
...
add tag-retention tab to project detail
Ignore codacy at present.
2019-07-30 11:44:21 +08:00
Wenkai Yin(尹文开)
b90874b06a
Merge pull request #8457 from bitsf/tag_retention_api_fix
...
fix tag retention api bug
2019-07-30 10:24:28 +08:00
Shijun Sun (c)
01b8e3690e
add tag-retention tab to project detail
...
Signed-off-by: AllForNothing <sshijun@vmware.com>
2019-07-30 10:06:15 +08:00
Steven Zou
1e7f51615f
fix conflicts in runtime/bootstrap.go
2019-07-30 09:52:22 +08:00
Steven Zou
3ca5116a53
add retention job for deleting repository
...
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-30 09:45:19 +08:00
Ziming
a5c31d7160
Merge pull request #8456 from ywk253100/190729_scheduler
...
Register the scheduler job and fix bugs
2019-07-30 08:57:10 +08:00
Ziming
81950980bd
fix ci
2019-07-30 08:33:32 +08:00
Steven Zou
4bf7f7b3e4
Merge pull request #8445 from steven-zou/fix/tag_retention
...
refactor index registering processes
2019-07-30 07:58:14 +08:00
Wenkai Yin(尹文开)
a85df489c0
Merge pull request #8435 from kofj/aliacr
...
Aliyun ACR adapter
2019-07-30 07:40:57 +08:00
Wenkai Yin
94c1cf8ac9
Register the scheduler job and fix bugs
...
1. Register the scheduler job
2. Fix retention bugs
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-07-30 07:37:47 +08:00
dorukhanguloz
6c62d11b8a
Add Turkish Language
...
Signed-off-by: dorukhanguloz dorukhanguloz@hotmail.com
Signed-off-by: Dorukhan Gülöz <dguloz@havelsan.com.tr>
2019-07-29 16:48:46 +02:00
Ziming Zhang
e8f9f58550
fix tag retention api bug
...
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I26bb4aade70f35132a345a945fa19d35e8c92571
2019-07-29 19:29:03 +08:00
Daniel Jiang
2211be7a80
Merge pull request #8446 from reasonerjt/group-perm-merge
...
Update GetRolesByGroupID
2019-07-29 19:11:51 +08:00
Ziming Zhang
7cc29f0b90
fix tag retention api bug
...
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I2c295090de34d133671c01422a6812fa426e9be7
2019-07-29 18:36:51 +08:00
慕薇疯魔
0d71eb363a
Aliyun ACR adapter
...
1. aliyun ACR registry adapter.
2. Unit test case.
3. Update go modules and vendor.
Signed-off-by: 疯魔慕薇 <kfanjian@gmail.com>
2019-07-29 18:24:03 +08:00
Steven Zou
fa678a12cc
fix the OR processor failure issue
...
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-29 17:43:20 +08:00
Ziming Zhang
b0f6000f16
fix tag retention api bug
...
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: Id01b3a00ee0fa18cb5b9e4a74bb61a76d7d29709
2019-07-29 17:40:38 +08:00
Wenkai Yin(尹文开)
7fd06edccf
Merge pull request #8451 from ywk253100/190729_retention_task
...
Add property "repository" to retention task
2019-07-29 17:18:42 +08:00
Wenkai Yin(尹文开)
c99f12fe33
Merge pull request #8444 from bitsf/tag_retention_exec_status
...
get execution status on the fly
2019-07-29 17:08:37 +08:00
Steven Zou
640fcdaee3
enhance the label selector
...
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-29 16:31:47 +08:00
Wang Yan
ca20281b35
Merge pull request #8438 from wy65701436/fix-quota-bug
...
Fix logic error in quota middlewware on handling failure response
2019-07-29 16:02:57 +08:00
Ziming Zhang
ba47b4c00f
get execution status on the fly
...
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: Iefcf8946d7a2c7a27bc22bd326ee9723b4b79c66
2019-07-29 14:48:39 +08:00
Steven Zou
6479a22a08
refacor index registering processes
...
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-29 14:01:47 +08:00
Wenkai Yin
a55860d2df
Add property "repository" to retention task
...
Add property "repository" to retention task
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-07-29 13:47:18 +08:00
Wenkai Yin(尹文开)
89066faff2
Merge pull request #8437 from wy65701436/add-pull-time
...
Update pull time in artifact table for docker image pull
2019-07-29 11:24:41 +08:00
Daniel Jiang
37b7ab6174
Update GetRolesByGroupID
...
This commit fixes #8432
When querying the role of group ID, all matched roles should be returned
instead of the minimal role ID.
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-07-29 11:24:35 +08:00
Wenkai Yin(尹文开)
829d9a56b4
Merge pull request #8436 from kofj/improve_awsecr
...
Improve awsecr parseRegion method.
2019-07-29 11:23:09 +08:00
Ziming
5a390d2fa0
Merge pull request #8429 from ywk253100/190726_retention_chartserver
...
Only listing chart repositories when chart server is enabled
2019-07-28 22:52:34 +08:00
Ziming
67b65814d9
Merge pull request #8434 from ywk253100/190727_retention
...
Fix bugs found in running the retention workflow
2019-07-28 22:52:16 +08:00
wang yan
1975f4a71d
Fix logic error in quota middlewware on handling failure response
...
Signed-off-by: wang yan <wangyan@vmware.com>
2019-07-28 12:37:58 +08:00
wang yan
a23ff4e448
Update pull time in artifact table for docker image pull
...
Signed-off-by: wang yan <wangyan@vmware.com>
2019-07-28 12:30:20 +08:00
疯魔慕薇
55cead910f
Improve awsecr parseRegion method.
...
Signed-off-by: 疯魔慕薇 <kfanjian@gmail.com>
2019-07-28 11:16:44 +08:00
Wenkai Yin
ab792019db
Fix bugs found in running the retention workflow
...
Fix bugs found in running the retention workflow
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-07-28 10:36:57 +08:00
Wenkai Yin
9235dcff54
Only listing chart repositories when chart server is enabled
...
Only listing chart repositories when chart server is enabled
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-07-28 09:08:41 +08:00
Ziming Zhang
83b045f5ec
add ut for tag retention controller
...
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I1469ee13675537ec389a068e4bc29e457b402fa4
2019-07-26 17:55:11 +08:00
Steven Zou
3a7066346b
Merge pull request #8418 from ywk253100/190725_retention_task_log
...
Implement getting the retention task log
2019-07-26 17:51:05 +08:00
Wenkai Yin
c49a09edb4
Implement getting the retention task log
...
Implement getting the retention task log
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-07-26 16:19:37 +08:00
Wenkai Yin(尹文开)
d45674960f
Merge pull request #8417 from goharbor/project-quota-dev
...
Add feature project quota dev
2019-07-26 15:41:09 +08:00
jwangyangls
993643bb78
Merge pull request #8407 from jwangyangls/oidc-ping
...
Add test button in configration width oidc mode
2019-07-26 14:30:29 +08:00
wang yan
54101180ae
Update log level for init proxy
...
Signed-off-by: wang yan <wangyan@vmware.com>
2019-07-26 13:39:06 +08:00
He Weiwei
c566a48880
fix(api,project): fix repo, chart count missing in project summary
...
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-07-26 13:15:44 +08:00
Yogi_Wang
9deeee5425
Add test button in configration width oidc mode
...
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-07-26 10:54:48 +08:00
jwangyangls
fe9eb9da20
Merge pull request #8339 from jwangyangls/quotaPerProject2
...
Add project quotas page in configration ,project
2019-07-26 10:25:05 +08:00
wang yan
676b922c95
merge with latest master code with quota branch
...
Signed-off-by: wang yan <wangyan@vmware.com>
2019-07-26 01:32:45 +08:00
Wang Yan
b9ea3731f7
Merge pull request #8350 from wy65701436/blob-flow-dev
...
Add size middleware to support quota
2019-07-26 01:25:40 +08:00
Wang Yan
1dfc47d24e
Add size middleware to support quota
...
[Add]:
1, size middleware for quota size
2, count middleware for quota artifact count
[Support]:
1, put, patch, mount blob
2, put manifest
[Refactor]:
1, Add handle response for middlerware
2, Remove the modifyResponse for registry proxy
3, Use the custom response writer to recored status
Signed-off-by: wang yan <wangyan@vmware.com>
2019-07-26 00:28:36 +08:00
Yogi_Wang
b1b915354e
Add project quotas in configration page
...
include quotas page and edit quota page
add quota field when create project
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-07-25 18:49:49 +08:00
Wenkai Yin
2e9521ad45
Support to stop one execution of retention
...
Support to stop one execution of retention
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-07-25 16:48:00 +08:00
He Weiwei
f3a2280033
Merge pull request #8384 from heww/quota-apis
...
feat(quota,api): APIs for quotas
2019-07-25 15:19:46 +08:00
He Weiwei
e625f2aa11
feat(quota,api): APIs for quotas
...
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-07-25 13:40:26 +08:00
Steven Zou
584dcd8571
support dry run of retention
...
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-25 12:53:19 +08:00
Steven Zou
b6c4ffee95
Merge pull request #8244 from mmpei/7980-chartReplication
...
Support helm chart replication from helmhub
2019-07-25 10:30:20 +08:00
jwangyangls
de6c2d51cf
Merge pull request #8370 from jwangyangls/fixUtIssue
...
Fix UT issue about it should support pagination
2019-07-25 10:22:40 +08:00
jwangyangls
8a6a4addb1
Merge pull request #8369 from jwangyangls/fixSomeIssue
...
Fix issue
2019-07-25 10:20:05 +08:00
wang yan
4763864dae
merge with latest master code with quota feature branch
...
Signed-off-by: wang yan <wangyan@vmware.com>
2019-07-24 08:47:05 -07:00
Steven Zou
c44747fd3c
merge code from master and fix conflicts
...
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-24 17:27:37 +08:00
Wenkai Yin(尹文开)
cd411f6588
Merge pull request #8385 from ywk253100/190724_task_hook
...
Implement the webhook handler for retention task
2019-07-24 17:22:57 +08:00
Ziming
43c2af9857
map retention with policy ( #8313 )
...
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Implement the API and controller of tag retention
- API handler
- retention controller
- dao
2019-07-24 17:22:26 +08:00
Wenkai Yin
e2808f12cf
Implement the webhook handler for retention task
...
Implement the webhook handler for retention task
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-07-24 14:32:05 +08:00
Wenkai Yin
1adf5c976e
Create retention client with the configurations got from jobservice config
...
As the retention client is only used in job which running in jobservice, the configurations that needed to init the client should be read from jobservice
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-07-24 13:10:10 +08:00
Wenkai Yin(尹文开)
94f0fb506b
Merge pull request #8134 from chlins/refactor/small-refactor-for-huawei-adapter
...
refactor: adjust some logic in huawei adapter
2019-07-24 12:13:23 +08:00
Wenkai Yin(尹文开)
c4836727be
Merge pull request #8377 from steven-zou/feature/tag_retention-logs
...
print rich logs in the retention job
2019-07-24 09:54:19 +08:00
Steven Zou
09c56bfa08
print rich logs in the retention job
...
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-24 09:02:51 +08:00
He Weiwei
ce58c58c01
feat(quota,api): quota support for create project API
...
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-07-24 01:02:51 +08:00
Yann David
51eb8bc60f
Search for LDAP_MATCHING_RULE_IN_CHAIN groups
...
Signed-off-by: Yann David <davidyann88@gmail.com>
2019-07-23 12:19:56 -04:00
Wenkai Yin
03cc8046eb
Implement the task management in retention manager
...
Implement the task management in retention manager
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-07-23 19:23:04 +08:00
Wenkai Yin
7362fae7cc
Implement a common scheduler
...
Implement a common scheduler that can be used globally
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-07-23 17:20:31 +08:00
Yogi_Wang
93c336c17d
Fix UT issue about it should support pagination
...
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-07-23 12:30:12 +08:00
Yogi_Wang
54c142d555
Fix the quoestion of the file setting.json
...
Clear the error message when Api failed
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-07-23 11:56:44 +08:00
Steven Zou
ccad9c0a29
support stop in the retention job and register it
...
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-23 11:05:22 +08:00
wang yan
2292954a31
Merge branch 'master' of https://github.com/goharbor/harbor into project-quota-dev
2019-07-22 15:46:09 +08:00
Wang Yan
e8565a4539
Merge pull request #8335 from reasonerjt/add-oidc-ping-api
...
Add API to ping OIDC endpoint
2019-07-22 14:30:24 +08:00
Steven Zou
6401314a3d
Merge pull request #8356 from steven-zou/feature/tag_retention-ut
...
add missing UT cases for index and builder components
2019-07-22 12:47:38 +08:00
Wang Yan
834e604ec0
Merge pull request #8246 from ninjadq/fix_chart_museum_500_error
...
Fix: Internal server error with messy code when chartmuseum not work
2019-07-22 11:07:55 +08:00
Nathan Lowe
b4e169db26
Fix logger line() call if built outside of the repo root
...
If harbor is built (or `go test`'d) in a different folder than the repo
root, the call to common/utils/log/line(...) will panic with an index
out of range runtime error because the separator can't find `harbor/src`
in the path.
Signed-off-by: Nathan Lowe <public@nlowe.me>
2019-07-21 22:30:17 -04:00
Nathan Lowe
a15be60946
Retention: Implement Rule: Always Keep
...
Signed-off-by: Nathan Lowe <public@nlowe.me>
2019-07-21 22:16:47 -04:00
Steven Zou
01d3243156
add missing UT cases for index and builder components
...
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-22 10:05:50 +08:00
Jakub Onderka
1723b6fa90
Fixed typo in en-us-lang.json
...
Signed-off-by: Jakub Onderka <jakub.onderka@gmail.com>
2019-07-20 14:43:58 +02:00
Steven Zou
deb021eb48
rebase and fix name conflicts among packages and vars
...
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-19 22:37:54 +08:00
Bernardo Pastorelli
791394a2b1
Make jobservice use the proxy env variables (including no_proxy)
...
Signed-off-by: Bernardo Pastorelli <berpast@hotmail.com>
2019-07-19 16:32:17 +02:00
Steven Zou
c76c5d7a1f
refactor packages to resolve the cycle importing issue
...
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-19 18:55:08 +08:00
Wenkai Yin
ddbde72d2e
Move the pkg manager/controller declaration to the api package
...
Move the pkg manager/controller declaration to the api package to avoid the dependency cycle
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-07-19 17:21:58 +08:00
peimingming
9f777ed43f
Fix by comments
...
Signed-off-by: peimingming <peimingming@corp.netease.com>
2019-07-19 17:04:40 +08:00
Will Sun
d38a08b15a
Merge pull request #8341 from AllForNothing/robot-ui
...
UI Modification: When New Robot
2019-07-19 16:59:14 +08:00
Steven Zou
f0ea62caa9
Merge branch 'feature/tag_retention' into feature/tag_retention-performer
2019-07-19 16:00:13 +08:00
Steven Zou
c2b5d95e02
implement retain action performer
...
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-19 15:59:21 +08:00
AllForNothing
bd5b195019
UI Modification: When New Robot
...
Signed-off-by: AllForNothing <sshijun@vmware.com>
2019-07-19 14:47:30 +08:00
Wenkai Yin
5f1d2bd644
Fix package import cycle issue
...
Fix package import cycle issue
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-07-19 13:50:55 +08:00
Will Sun
ec9c216274
Merge pull request #8332 from AllForNothing/time-error
...
fix issue : time shown for scheduled scanning is incorrect
2019-07-19 11:32:50 +08:00
He Weiwei
9c9b8d3a6d
Merge branch 'master' into project-quota-dev
2019-07-19 10:02:51 +08:00
Daniel Jiang
96e2e0b145
Add API to ping OIDC endpoint
...
This commit adds an API to help admin verify the OIDC endpoint is a
valid one.
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-07-18 19:32:12 +08:00
stonezdj
13772b859e
Fix OnBoardGroup issue
...
Signed-off-by: stonezdj <stonezdj@gmail.com>
Fix issue when adding a HTTP user group to a project member, returns HTTP 500 error.
2019-07-18 19:19:09 +08:00
AllForNothing
9404810a1c
fix issue : time shown for scheduled scanning is incorrect
...
Signed-off-by: AllForNothing <sshijun@vmware.com>
2019-07-18 18:05:01 +08:00
AllForNothing
4979c4a49c
The item in CVE whiltelist should be a click-able link
...
Signed-off-by: AllForNothing <sshijun@vmware.com>
2019-07-18 16:17:43 +08:00
Steven Zou
24190291b6
update doublestar pattern and the failed launcher UT cases
...
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-18 14:50:02 +08:00
Steven Zou
0994e5efc9
Merge pull request #8321 from nlowe/feat/retention/GH-6657-last-active-n
...
Retention: Implement Evaluator: Retain Latest K 'Active'
2019-07-18 12:03:41 +08:00
Steven Zou
c8d2a2384a
Merge pull request #8289 from nlowe/feat/retention/GH-6659-keep-most-recently-pulled
...
Retention: Implement Evaluator: Keep N Most Recently Pulled
2019-07-18 11:27:00 +08:00
Steven Zou
2d62b2eb33
Merge pull request #8317 from steven-zou/feature/retention-selectors
...
implement label and regexp selectors
2019-07-18 11:25:08 +08:00
Nathan Lowe
040b235472
Retention: Implement Evaluator: Retain Latest K 'Active'
...
Signed-off-by: Nathan Lowe <public@nlowe.me>
2019-07-17 23:14:29 -04:00
Steven Zou
746d082e2e
Merge branch 'master' into feature/tag_retention
2019-07-18 10:40:49 +08:00
Steven Zou
be8a9c0446
implement label and regexp selectors
...
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-18 10:32:47 +08:00
Nathan Lowe
b61f45e038
Retention: Implement Evaluator: Keep N Most Recently Pulled
...
Signed-off-by: Nathan Lowe <public@nlowe.me>
2019-07-17 14:29:37 -04:00
Wang Yan
4cdb6fb975
Merge pull request #8239 from bitsf/fix_replication_dockerhub_tls
...
fix replication dockerhub skip tls
2019-07-17 15:35:29 +08:00
Wenkai Yin(尹文开)
a64e089773
Merge pull request #8210 from stonezdj/http_group_dao2
...
Add HTTP group support
2019-07-17 15:22:36 +08:00
DQ
af58195a29
Fix: Internal server error with messy code when chartmuseum not work
...
log err when doesn't get data from chart museum
Signed-off-by: DQ <dengq@vmware.com>
2019-07-17 15:14:50 +08:00
Wenkai Yin
d6c6231e08
Implement the retention client
...
Implement the retention client
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-07-17 14:04:29 +08:00
Wang Yan
31c3413ddf
Merge pull request #8288 from wy65701436/mf-workflow-base
...
Add quota workflow for manifest
2019-07-17 11:25:30 +08:00
Steven Zou
0b2f94b0dd
Merge pull request #8256 from goharbor/feat/retention/GH-6661-retain-newer-than-n-days
...
Retention: Implement Evaluator: Retain if created less than x days ago
2019-07-17 00:04:40 +08:00
Steven Zou
3243d5bce1
Merge pull request #8255 from goharbor/feat/retention/GH-6660-keep-most-recent-n
...
Retention: Implement Filter: Keep Latest K
2019-07-17 00:04:02 +08:00
Ziming Zhang
815901ea33
fix
...
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I3f2d3c7f1e32b4983c31c23d9753f04239e3c82f
Signed-off-by: Ziming Zhang <zziming@vmware.com>
2019-07-16 19:24:40 +08:00
stonezdj
bb2ae7c093
Add HTTP group feature
...
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-07-16 15:38:46 +08:00
Shijun Sun (c)
140a3da238
modify UT for cve-whitelist UI
...
Signed-off-by: Shijun Sun (c) <sshijun@vmware.com>
2019-07-16 15:24:15 +08:00
Ziming Zhang
c22c38994a
retention api
...
Change-Id: I70f2c34d6bb96ecf4cb5359e2b1ab2dbb99fdbf9
Signed-off-by: Ziming Zhang <zziming@vmware.com>
2019-07-16 15:06:37 +08:00
wang yan
105518fe12
Merge branch 'master' of https://github.com/goharbor/harbor into project-quota-dev
2019-07-16 14:51:37 +08:00
Wang Yan
8ac6bdbbb0
Add quota workflow for quota
...
1, apply count for manifest if it's a new image
2, insert data for artifact and artifact_blob
Signed-off-by: wang yan <wangyan@vmware.com>
2019-07-16 14:48:05 +08:00
Shijun Sun (c)
274ab7bcff
add CVE-Whitelist
...
Signed-off-by: Shijun Sun (c) <sshijun@vmware.com>
2019-07-15 19:47:46 +08:00
Nathan Lowe
d7e6b1b621
Sort artifacts before processing and port tests to github.com/stretchr/testify/suite
...
Signed-off-by: Nathan Lowe <public@nlowe.me>
2019-07-14 22:45:36 -04:00
Nathan Lowe
f03ed9b14c
Port tests to github.com/stretchr/testify/suite
...
Signed-off-by: Nathan Lowe <public@nlowe.me>
2019-07-14 22:38:26 -04:00
chlins
fc713a1763
refactor: fix unit tests
...
Signed-off-by: chlins <chlins.zhang@gmail.com>
2019-07-12 11:33:31 +08:00
chlins
000fe3d084
refactor: adjust some logic in huawei adapter
...
Signed-off-by: chlins <chlins.zhang@gmail.com>
2019-07-12 11:33:30 +08:00
wang yan
f066d986b9
merge with latest master code
2019-07-11 20:21:15 +08:00
Wang Yan
b98ca7bf0b
Merge pull request #8237 from wy65701436/redis-locker
...
add redis lock
2019-07-11 20:10:16 +08:00
wang yan
ef14f0cf35
add redis lock, it will be used to lock digest in the quota scenario
...
Signed-off-by: wang yan <wangyan@vmware.com>
2019-07-11 19:24:24 +08:00
Wenkai Yin(尹文开)
44ad142d86
Merge pull request #8260 from ywk253100/190709_launcher
...
Implement the launcher
2019-07-11 18:21:04 +08:00
Wenkai Yin
91b050a01b
Implement the launcher
...
The commit implements the launcher for tag retention
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-07-11 17:18:46 +08:00
Steven Zou
69ff8ff8ba
Merge pull request #8277 from steven-zou/feature/tag_retentio_more_evaluators
...
add more rule evaluators
2019-07-11 14:09:29 +08:00
Steven Zou
07250469ac
add more rule evaluators
...
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-11 10:50:10 +08:00
Steven Zou
52ca6de22a
refactor the processor interface
...
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-11 00:23:19 +08:00
mmpei
f32670058a
Fix by comments
...
Signed-off-by: mmpei <peimingming@corp.netease.com>
2019-07-10 17:31:59 +08:00
Wenkai Yin(尹文开)
3bebf7bc64
Merge pull request #8238 from reasonerjt/project-cve-whitelist
...
Enable project level CVE whitelist
2019-07-10 14:41:01 +08:00
jwangyangls
432f08b5b5
Merge pull request #8241 from jwangyangls/fixReplicationLabelFilterbug
...
Fix bug when no labels
2019-07-10 14:38:51 +08:00
jwangyangls
c73fa851ff
Merge pull request #8221 from jwangyangls/addGroupInhttpMode
...
Add user group when http auth mode
2019-07-10 14:38:31 +08:00
Steven Zou
9756195496
implement retention job
...
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-10 14:01:17 +08:00
Yogi_Wang
6ef82d4db9
Fix bug when no labels
...
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-07-10 13:02:34 +08:00
Nathan Lowe
8b174825c1
Retention: Implement Evaluator: Retain if created less than x days ago
...
Signed-off-by: Nathan Lowe <public@nlowe.me>
2019-07-09 23:46:26 -04:00
Nathan Lowe
4ecbe749e4
Retention: Implement Filter: Keep Latest K
...
Signed-off-by: Nathan Lowe <public@nlowe.me>
2019-07-09 23:24:56 -04:00
Wang Yan
155b0b0acd
Merge pull request #8175 from heww/quota-manager
...
Add manager for quota
2019-07-10 11:03:57 +08:00
peimingming
4946c7bba7
Add helm chart replication from helmhub
...
Signed-off-by: peimingming <peimingming@corp.netease.com>
2019-07-10 11:01:02 +08:00
wang yan
6d0271ee5c
Merge branch 'master' of https://github.com/goharbor/harbor into project-quota-dev
2019-07-10 10:57:10 +08:00
Steven Zou
185f4f3861
refine or.processor implementation and also add UT case
...
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-09 22:10:09 +08:00
Steven Zou
3409065438
implement policy builder
...
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-09 17:43:19 +08:00
Steven Zou
c36afcd07d
add index for rule,selector and performer
...
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-09 15:10:53 +08:00
He Weiwei
41ba410bb2
Manager for quota
...
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-07-09 13:59:48 +08:00
Wang Yan
7fd0bbcbd2
Merge pull request #8230 from wy65701436/dao-artifact
...
add dao of artifact
2019-07-09 13:44:05 +08:00
wang yan
7b38389898
update codes per review comments
...
Signed-off-by: wang yan <wangyan@vmware.com>
fix middlewares per review comments
1, add scheme1 and scheme2 check
2, change MustCompile to Compile
Signed-off-by: wang yan <wangyan@vmware.com>
2019-07-09 11:08:19 +08:00
wang yan
b3c5137a2f
add copyright and fix codecy
...
Signed-off-by: wang yan <wangyan@vmware.com>
2019-07-09 11:08:19 +08:00
wang yan
57821b1b4c
Refactor interceptors code with chain
...
1, add a blob inteceptors for quota usage
2, add a manifest inteceptors for quota usage
Signed-off-by: wang yan <wangyan@vmware.com>
2019-07-09 11:08:11 +08:00
Steven Zou
24ee32d7d1
define the base interfaces for the tag retention feature
...
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-09 09:40:59 +08:00
wang yan
24c3753581
add dao of artifact
...
Signed-off-by: wang yan <wangyan@vmware.com>
Add dao for quota
Signed-off-by: He Weiwei <hweiwei@vmware.com>
fix govet
Signed-off-by: wang yan <wangyan@vmware.com>
2019-07-08 23:42:50 +08:00
Daniel Jiang
8f5f0031c7
Enable project level CVE whitelist
...
This commit update the project API to support "reuse_sys_cve_whitelist"
setting in project metadata and "cve_whitelist" in project request.
Also modify the interceptor to support project level CVE whitelist if
the reuse flag is false.
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-07-08 18:55:54 +08:00
Yogi_Wang
c57087574a
Add user group when http auth mode
...
add the pages in project and system
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-07-08 17:28:38 +08:00
Ziming Zhang
0691a5ad9c
fix replication dockerhub tls skip tls
...
Change-Id: I9584d89cf9bda2b782b0fd556450a81be0fc7510
Signed-off-by: Ziming Zhang <zziming@vmware.com>
2019-07-08 08:17:26 +00:00
Wenkai Yin(尹文开)
5f9420a5a7
Merge pull request #8190 from ywk253100/190701_replication
...
Merge Default ImageRegistry into the native adapter to reduce the duplicate code
2019-07-08 12:47:55 +08:00
Daniel Jiang
c296f0ddfb
Merge pull request #8176 from stonezdj/http_group
...
Refactor LDAP usergroup
2019-07-08 09:54:31 +08:00
stonezdj
c0ed55445d
Refactor LDAP group
...
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-07-05 14:44:18 +08:00
Wenkai Yin(尹文开)
0f28fe42fd
Merge pull request #8167 from ywk253100/190622_replication
...
Support v1 signed media type when do the replication
2019-07-05 14:33:22 +08:00
Wenkai Yin(尹文开)
c01bedb740
Merge pull request #8220 from reasonerjt/oidc-rotation-fix
...
Reload OIDC provider older than 3 seconds
2019-07-05 10:12:33 +08:00
Daniel Jiang
a75bc027de
Merge pull request #8213 from reasonerjt/oidc-helm-push
...
Handle helm push in OIDC filter
2019-07-04 15:56:50 +08:00
Daniel Jiang
88a5572f8e
Reload OIDC provider older than 3 seconds
...
This commit make sure the OIDC is more actively recreated, to mitigate
the problem in #8177
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-07-04 14:55:34 +08:00
He Weiwei
4fedfa6580
Add dao for quota
...
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-07-04 11:53:26 +08:00
Steven Zou
63e2ce7606
Merge pull request #8209 from steven-zou/fix/enqueuer_schedule_slot
...
use separate key for the last periodic enqueue data
2019-07-03 21:48:21 +08:00
Steven Zou
8fc693d843
Merge pull request #8208 from steven-zou/fix/enqueuer_ut
...
fix failure ut case of job service
2019-07-03 17:32:13 +08:00
Daniel Jiang
8a9d352f54
Handle helm push in OIDC filter
...
Fixes #8130
Enable OIDC filter to handle requests to /api/chartrepo/*
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-07-03 17:29:37 +08:00
Steven Zou
b88159e747
use separate key for the last periodic enqueue data
...
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-03 17:08:23 +08:00
Daniel Jiang
5d887ad0d8
Merge pull request #8179 from reasonerjt/interceptor-use-whitelist
...
Apply CVE white list in interceptor
2019-07-03 15:12:33 +08:00
Steven Zou
1002e3ce17
fix failure ut case of job service
...
Signed-off-by: Steven Zou <szou@vmware.com>
2019-07-03 15:10:41 +08:00
Daniel Jiang
bba4b2a6a4
Apply CVE white list in interceptor
...
Interceptor will filter the vulnerability in whitelist while calculating
the serverity of an image and determine whether or not to block client
form pulling it.
It will use the system level whitelist in this commit, another commit
will switch to project level whitelist based on setting in a project.
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-07-03 14:13:00 +08:00