Commit Graph

3518 Commits

Author SHA1 Message Date
jwangyangls
b0b63fdeae
Merge pull request #9666 from jwangyangls/fix-ut-warning
Fix a warning that appears when running the test
2019-10-31 15:37:21 +08:00
Yogi_Wang
7aa47f8450 Fix a warning that appears when running the test
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-10-31 14:28:59 +08:00
Steven Zou
afb46188b2 return more clear error message for scan related API
- add a common error pkg to support error with code and AsError check
- replace some errors in scan with coded errors
- fix #9668

Signed-off-by: Steven Zou <szou@vmware.com>
2019-10-31 11:35:55 +08:00
jwangyangls
cfffbb5e37
Merge pull request #9659 from jwangyangls/fix-ui-style-margin-top-0
Fix page style confusion caused by error margin-top
2019-10-31 10:03:04 +08:00
wang yan
253e87d186 inject ldflags for harbor compiler and linker
1, replace the UIVERSION file with ldflags, which is generarted by make to inject into the UI core.
2, inject additional ldflags for harbor compiler

Signed-off-by: wang yan <wangyan@vmware.com>
2019-10-30 18:31:42 +08:00
Wenkai Yin(尹文开)
5d6cbe9aa1
Merge pull request #9654 from heww/fix-qutoa-order-by
fix(quota): order by quotas only on support resources
2019-10-30 17:20:17 +08:00
Yogi_Wang
f7532ff6a1 Fix page style confusion caused by error margin-top
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-10-30 16:46:10 +08:00
jwangyangls
b964d0411b
Merge pull request #9622 from jwangyangls/fix-ui-immutable-style
Improve immutable ui style
2019-10-30 15:03:18 +08:00
Yogi_Wang
a9adc50550 Improve immutable ui style
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-10-30 12:07:48 +08:00
Will Sun
5f62b5778b
Merge pull request #9611 from AllForNothing/scanner-bug
Improve scanner UI
2019-10-30 10:43:48 +08:00
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
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