Commit Graph

3687 Commits

Author SHA1 Message Date
jwangyangls
a84500e934
Merge pull request #10282 from jwangyangls/remove-id
Remove duplicate ids
2019-12-17 15:55:25 +08:00
Will Sun
2755666941
Merge pull request #10267 from AllForNothing/improve
Improve search function for replication and tags
2019-12-17 11:18:02 +08:00
Yogi_Wang
95cf46ab62 Remove duplicate ids
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-12-17 10:45:22 +08:00
Yogi_Wang
878efbce8f Translation modification of replication and tag in Chinese mode
1.replicaiton ==> 复制
2.tag ==> tag
3.retag ==> tag拷贝
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-12-16 15:09:12 +08:00
AllForNothing
5d12423f74 Improve search function for replication and tags
Signed-off-by: AllForNothing <sshijun@vmware.com>
2019-12-16 11:27:48 +08:00
jwangyangls
de4091feeb
Merge pull request #10228 from jwangyangls/add-more-ut
Add more ui ut
2019-12-16 10:19:59 +08:00
stonezdj(Daojun Zhang)
8522374058
Merge pull request #10242 from reasonerjt/stastic-api-group-member
Stastics API should handle group members
2019-12-13 15:47:24 +08:00
Yogi_Wang
d84733ea57 Add more ui ut
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-12-13 12:38:02 +08:00
Wenkai Yin(尹文开)
5836b1eb83
Merge pull request #10138 from ywk253100/191204_artifact
Create the models for OCI supporting
2019-12-12 16:38:40 +08:00
Wenkai Yin
7b41c900a7 Create the models for OCI supporting
This commits does some basic init work for supporting OCI:
1. Create the artifact and tag model
2. Create database tables

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-12-12 16:05:38 +08:00
Will Sun
4cee3c7332
Merge pull request #10223 from AllForNothing/master
Add links to view doc for scanners ui(cherry-pick #10220)
2019-12-12 14:01:01 +08:00
Daniel Jiang
7bd19f497c Stastics API should handle group members
statistic API use security Context to list project rather than calling
projectmanager directly, such that the group membership will be taken
into account.
fixes #10230

It should be cherry picked to 1.9.x and 1.10.x branches

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-12-11 18:52:43 +08:00
Steven Zou
27420b8660 fix[scan]:missing header in v1 client
- add the missing resolver calls to the v1 client

fix #10108

Signed-off-by: Steven Zou <szou@vmware.com>
2019-12-11 17:10:57 +08:00
sshijun
df6c1ab6b2 Add links to view doc for scanners ui
Signed-off-by: sshijun <sshijun@vmware.com>
2019-12-11 13:20:26 +08:00
Wenkai Yin(尹文开)
dda6f638a9
Merge pull request #10154 from wy65701436/fix-10092-cp
[cherry-pick] improve pulling vulnerable images warning message
2019-12-06 13:56:13 +08:00
Wang Yan
9405b11480
Merge pull request #10114 from julienvey/typo-registryctl
Fix typo in registryctl client log
2019-12-06 13:15:16 +08:00
Wang Yan
9e83b9f1fc
Merge pull request #10164 from ywk253100/191205_sort
Sort the tag before returning the list when calling API
2019-12-06 11:38:31 +08:00
jwangyangls
d36ceee9b0
Merge pull request #10142 from jwangyangls/fix-bug-1.10
Fix bug in master about 1.10
2019-12-06 10:07:50 +08:00
Wenkai Yin
4043ef8aa9 Sort the tag before returning the list when calling API
Sort the tag before returning the list when calling API list tag API

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-12-05 19:50:45 +08:00
Will Sun
d803fd0a72
Merge pull request #10143 from AllForNothing/ui-modification
Modify ui to fix some bugs
2019-12-05 18:30:32 +08:00
Yogi_Wang
97b92c98ba Fix bug in master about 1.10
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-12-05 16:38:41 +08:00
Will Sun
48f215e416
Merge pull request #9873 from AllForNothing/event-panel
Modify event panel
2019-12-05 15:24:06 +08:00
Will Sun
967ff8440b
Merge pull request #10109 from AllForNothing/more-ut-2
Add more UI UT
2019-12-05 15:13:30 +08:00
wang yan
317149160d improve pulling vulnerable images warning message
To make the message more friendly and readable for the end-user

Signed-off-by: wang yan <wangyan@vmware.com>
2019-12-05 14:32:34 +08:00
Wang Yan
2fb1cc89d9
Merge pull request #10031 from ywk253100/191128_config
Fix bug when trying to get the external URL
2019-12-05 14:26:54 +08:00
Wang Yan
9016c427b9
Merge pull request #10136 from reasonerjt/rm-authproxy-case-sensitive
Get rid of case-sensitivity in authproxy setting
2019-12-05 14:26:18 +08:00
jwangyangls
ff02d80382
Merge pull request #10134 from jwangyangls/add-ui-ut-app
Test: add more ut in front end
2019-12-05 10:21:32 +08:00
sshijun
e269786c45 Modify ui to fix some bugs
Signed-off-by: sshijun <sshijun@vmware.com>
2019-12-05 09:50:06 +08:00
Daniel Jiang
d58f5e4bdc Get rid of case-sensitivity in authproxy setting
This commit removes the attribute to control case-sensitivity from
authproxy setting.
The result in token review status will be used as the single source of
truth, regardless the case of the letters in group names and user names.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-12-04 21:39:40 +08:00
Wenkai Yin(尹文开)
d145f4baf4
Merge pull request #10034 from ywk253100/191128_clean
Clean up admiral-related code
2019-12-04 17:33:31 +08:00
Yogi_Wang
f705b659e8 Test: add more ut in front end
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-12-04 16:26:18 +08:00
stonezdj(Daojun Zhang)
339c1d4cab
Merge pull request #10088 from reasonerjt/authproxy-cert-setting
Support pinning to authproxy server's cert
2019-12-04 14:03:27 +08:00
Wenkai Yin(尹文开)
a1712e5332
Merge pull request #10083 from MrMEEE/fix-listings-squashed
Squashed version of PR-9943
2019-12-04 09:35:20 +08:00
Julien Vey
a13f918fd0 Fix typo in registryctl client
Signed-off-by: Julien Vey <vey.julien@gmail.com>
2019-12-03 23:51:15 +01:00
sshijun
8e779fc9bc Add more UI UT
Signed-off-by: sshijun <sshijun@vmware.com>
2019-12-03 15:55:47 +08:00
Will Sun
2bc2b4ef71
Merge pull request #10081 from AllForNothing/more-ut
Add more ut for ui
2019-12-03 15:51:06 +08:00
AllForNothing
bb7f844eec Modify event panel
Signed-off-by: AllForNothing <sshijun@vmware.com>
2019-12-03 10:51:36 +08:00
Yogi_Wang
f022e89843 Modify the repository list sort and filter
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-12-03 10:37:41 +08:00
Daniel Jiang
902598fabd Support pinning to authproxy server's cert
This commit add an attribute to configurations, whose value is the
certificate of authproxy server.  When this attribute is set Harbor will
pin to this cert when connecting authproxy.
This value will also be part of the response of systemInfo API.

This commit will be cherrypicked to 1.10 and 1.9 branch.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-12-03 07:31:26 +08:00
Martin Juhl
06594a1756 Squashed version of PR-9943
Signed-off-by: Martin Juhl <m@rtinjuhl.dk>
2019-12-02 11:59:33 +01:00
sshijun
60dfb87caa Add more ut for ui
Signed-off-by: sshijun <sshijun@vmware.com>
2019-12-02 16:58:24 +08:00
Yogi_Wang
97e08c50c9 refactor project tab
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-11-29 12:02:08 +08:00
Will Sun
c275bbe1dc
Merge pull request #10036 from AllForNothing/tag-retention-bug
Fix tag-retention ui bug
2019-11-29 10:07:13 +08:00
sshijun
dbd65fd94a Fix tag-retention ui bug
Signed-off-by: sshijun <sshijun@vmware.com>
2019-11-28 17:29:06 +08:00
Wenkai Yin
dd2bc0ecef Clean up admiral-related code
Clean up admiral-related code as it's useless

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-11-28 17:28:54 +08:00
sshijun
a254e9e6f6 Disable scan now button if no default scanner
Signed-off-by: sshijun <sshijun@vmware.com>
2019-11-28 11:03:48 +08:00
Wenkai Yin
2498d597b4 Fix bug when trying to get the external URL
Fix bug when trying to get the external URL

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-11-28 10:51:42 +08:00
Will Sun
a52b99e180
Merge branch 'master' into remove-lib 2019-11-27 17:44:30 +08:00
Daniel Jiang
030637efbf
Merge pull request #10002 from reasonerjt/groups-review-token-filter
populate group list when doing token review
2019-11-27 15:18:03 +08:00
jwangyangls
7914c58e50
Merge pull request #9989 from jwangyangls/fix-token-expired
Resolve token expiration issues
2019-11-27 14:28:52 +08:00
sshijun
c692f5c67e Move lib into src for better UI building
Signed-off-by: sshijun <sshijun@vmware.com>
2019-11-27 09:59:06 +08:00
Daniel Jiang
3664bf36d2 populate group list when doing token review
This commit fixes #9869
It has some refactor to make sure the group is populated when user is
authenticated via tokenreview workflow.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-11-26 13:31:42 +08:00
Daniel Jiang
b2b531d3af Update minimum length of project name
This commit fixes #9946, that when creating a project the minimum length
should be 1, not 2.

This commit should be cherry picked to 1.9.x and 1.10.x branch .

We need to double check if this change impacts the creation of replication
rule.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-11-26 12:41:51 +08:00
Yogi_Wang
6129b07c4c Reslove the token expired
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-11-26 10:54:14 +08:00
Yogi_Wang
1a3e8ebb81 Modify the style of language and modify variable name
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-11-22 16:05:37 +08:00
jwangyangls
cfff0b6aaa
Merge pull request #9581 from bashofmann/fix-about-dialog
Fix broken about dialog on sign in page
2019-11-22 14:55:48 +08:00
Will Sun
96b22948dd
Merge pull request #9948 from AllForNothing/filter
Fix filter bug for registries and labels datagrid
2019-11-22 10:05:28 +08:00
He Weiwei
fec76c3d57
fix(limited-guest): fix limited guest info missing in summary page (#9957)
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-11-22 10:03:02 +08:00
Yogi_Wang
5b6e1d9f88 Fix ui issue about the third round test
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-11-21 14:56:53 +08:00
sshijun
3777bbab39 Fix filter bug for registries and labels datagrid
Signed-off-by: sshijun <sshijun@vmware.com>
2019-11-21 10:53:24 +08:00
Will Sun
f3f481dd12
Merge pull request #9938 from jwangyangls/fix-retag-issue
FIx the tag list is not refreshed when the target refills the current repository when the retag is operated.
2019-11-20 16:34:31 +08:00
Yogi_Wang
aa925876c3 FIx the tag list is not refreshed when the target refills the current repository when the retag is operated.
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-11-20 13:20:57 +08:00
jwangyangls
cd8a8105e3
Merge pull request #9921 from jwangyangls/fix-select-words
Fix version info in about dialog can not select and copy
2019-11-20 10:02:47 +08:00
Daniel Jiang
4e1bac4b82
Merge pull request #9820 from reasonerjt/oidc-cli-secret-group
Populate user groups during OIDC CLI secret verification
2019-11-19 03:03:38 -08:00
Yogi_Wang
6416aa4025 Fix version info in about dialog can not select and copy
fix 9854
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-11-19 16:39:43 +08:00
Daniel Jiang
70a2930330
Merge pull request #9919 from wy65701436/fix-9880
add empter result to list immutable rules
2019-11-19 00:01:41 -08:00
Daniel Jiang
64af09d52b Populate user groups during OIDC CLI secret verification
This commit refactors the flow to populate user info and verify CLI
secret in OIDC authentication.

It will call the `userinfo` backend of OIDC backend and fallback to
using the ID token if userinfo is not supported by the backend.

It also makes sure the token will be persisted if it's refreshed during
this procedure.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-11-18 23:53:05 -08:00
wang yan
e854c4fa1b add empter result to list immutable rules
Fix #9880

Signed-off-by: wang yan <wangyan@vmware.com>
2019-11-19 15:27:01 +08:00
Wang Yan
bc0ff095c3
Merge pull request #9899 from heww/fix-9767
fix(scanner): process scenario reinstall without clair flag
2019-11-19 13:17:28 +08:00
Wang Yan
eab974419c
Merge pull request #9825 from stonezdj/bug_9681
Avoid to create duplicated immutable tag rules in the same project
2019-11-18 17:26:22 +08:00
jwangyangls
a1ccc0242b
Merge pull request #9881 from jwangyangls/fix-datagrid-text-overflow
Fix datagrid text overflow issue
2019-11-18 17:21:41 +08:00
He Weiwei
0c068d81f5
feat(vuln-severity): map negligible to none to match CVSS v3 ratings (#9885)
BREAKING CHANGE: the value negligible of severity in project metadata will change to none in the responses of project APIs

Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-11-18 14:36:51 +08:00
He Weiwei
8b740ace8a
fix(i18n): fix missing i18n for limited guest in group (#9903)
Closes #9768

Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-11-18 10:40:35 +08:00
He Weiwei
0246ca7aa4 fix(scanner): process scenario reinstall without clair flag
1. Fix name conflict when install internal clair adapter.
2. Remove all internal adapters when reinstall harbor without --with-clair flag

Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-11-15 09:47:30 +00:00
Wang Yan
6e03c8a54e
Merge pull request #9896 from heww/owner-check-for-project-member-robot-account
fix(robot,project-member): check owner of member, robot when update, …
2019-11-15 16:53:22 +08:00
Yogi_Wang
0de882ffa6 Fix datagrid text overflow issue --1.10new feature change
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-11-15 15:44:12 +08:00
Yogi_Wang
1ccbc3b52b Fix datagrid text overflow issue
solve the problem of overlapping the line due to newly created inline characters
(should used for 1.9.x)
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-11-15 15:22:16 +08:00
stonezdj
15898f2069 Avoid to create duplicated immutable tag rules in the same project
Fix #9681, add constraint on immutable_tag_rule and catch the error

Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-11-15 14:46:23 +08:00
Will Sun
d4c5d93264
Merge pull request #9884 from AllForNothing/database
Add vulnerability database update time and scanner name
2019-11-15 13:39:32 +08:00
sshijun
8f3beb3e31 Add vulnerability database update time and scanner name
Signed-off-by: sshijun <sshijun@vmware.com>
2019-11-15 11:38:16 +08:00
Wang Yan
88773436c9
Merge pull request #9865 from wy65701436/quota-event
add quota exceed event imple
2019-11-15 11:37:19 +08:00
chlins
130e406d3c fix(replication): huawei adapter multi authorization
Signed-off-by: chlins <chlins.zhang@gmail.com>
2019-11-15 11:33:01 +08:00
Wang Yan
7b12ed14a1
Merge pull request #9852 from stonezdj/remove_tedious_msg
Change log level to avoid tedious error in log
2019-11-15 10:42:28 +08:00
jwangyangls
01ca8a7a36
Merge pull request #9864 from jwangyangls/fix-webhook-modal
Fix webhook testing-error bug
2019-11-14 19:11:40 +08:00
Wang Yan
4bec9bbfc6
Merge pull request #9875 from wy65701436/middleware-policy-checker
enable policy checker in response handler
2019-11-14 18:31:50 +08:00
wang yan
a39e1a2a34 enable policy checker in response handler
Signed-off-by: wang yan <wangyan@vmware.com>
2019-11-14 15:39:29 +08:00
He Weiwei
5bd1cfdbf2 fix(robot,project-member): check owner of member, robot when update, delete
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-11-14 07:00:44 +00:00
Wang Yan
29be93725d
Merge pull request #9860 from reasonerjt/authproxy-case-sensitive-master
Authproxy case sensitive master
2019-11-14 14:03:53 +08:00
Daniel Jiang
6f0b4a139a
Merge pull request #9838 from stonezdj/fix_review
Fix review comments on PR9749
2019-11-14 13:12:56 +08:00
Wang Yan
10850a06d8
Merge pull request #9859 from ywk253100/191113_subresource_1.10
Refine the implementation of replication execution API
2019-11-14 11:30:10 +08:00
wang yan
f8390c5ec1 add quota exceed event imple
Signed-off-by: wang yan <wangyan@vmware.com>
2019-11-14 10:27:18 +08:00
stonezdj(Daojun Zhang)
e52c7c2304
Merge pull request #9862 from stonezdj/191112_subresource
Refactor immutable tag rule
2019-11-14 10:19:24 +08:00
Yogi_Wang
71a5d24633 Fix webhook testing-error bug
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-11-14 10:05:52 +08:00
Will Sun
b4039eb256
Merge pull request #9857 from AllForNothing/error-handle
Modify the way to handle 409 error
2019-11-13 19:20:41 +08:00
Will Sun
591eb6f658
Merge pull request #9851 from AllForNothing/disable
Fix bug: disabled radio is still clickable
2019-11-13 19:20:23 +08:00
Will Sun
87de8f1de0
Merge pull request #9850 from jwangyangls/add-scanner-nightly-case
Modify scan now nightly case
2019-11-13 19:20:08 +08:00
stonezdj
a3c298e9fd Refactor immutable tag rule
Change implementation
Fix some nil pointer issue

Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-11-13 19:09:31 +08:00
sshijun
1371d53a97 Modify the way to handle 409 error
Signed-off-by: sshijun <sshijun@vmware.com>
2019-11-13 16:24:09 +08:00
sshijun
2b295b2d6e Fix bug: disabled radio is still clickable
Signed-off-by: sshijun <sshijun@vmware.com>
2019-11-13 16:14:35 +08:00
Daniel Jiang
8933ab8074 Add configuration "case sensitive" to HTTP auth proxy
This commit make case sensitivity configurable when the authentication
backend is auth proxy.
When the "http_authproxy_case_sensitive" is set to false, the name of
user/group will be converted to lower-case when onboarded to Harbor, so
as long as the authentication is successful there's no difference regardless
upper or lower case is used.  It will be mapped to one entry in Harbor's
User/Group table.
Similar to auth_mode, there is limitation that once there are users
onboarded to Harbor's DB this attribute is not configurable.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-11-13 15:00:05 +08:00
Wenkai Yin
54c5811974 Update the test cases of user API
Update the test cases of user API

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-11-13 14:51:29 +08:00
Wenkai Yin
05ffb7a3c5 Refine the implementation of replication execution API
Remove the duplicated code in replication execution API

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-11-13 14:26:57 +08:00
stonezdj
dc5cb3504c Change log level to avoid tedious error in log
change from error to debug

Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-11-13 11:15:00 +08:00
jwangyangls
8849b0fb9c
Merge pull request #9833 from jwangyangls/fix-page-not-refresh
Solve the problem that the style cannot be neat because the page is not refreshed
2019-11-13 10:14:05 +08:00
Yogi_Wang
e951ceb31c Modify scan now nightly case
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-11-13 10:09:03 +08:00
Wang Yan
bc5ec647b0
Merge pull request #9837 from wy65701436/fix-immu-error-msg
update immutable tag error message format
2019-11-12 18:43:45 +08:00
Will Sun
9367b3f240
Merge pull request #9839 from AllForNothing/unexpected
Fix tag select bug in tag component
2019-11-12 18:17:40 +08:00
Wenkai Yin(尹文开)
c415850527
Merge pull request #9787 from ywk253100/191107_helmhub
Add adapter pattern for helm hub adapter
2019-11-12 18:00:27 +08:00
Yogi_Wang
2ddcee8e03 Solve the problem that the style cannot be neat because the page is not refreshed
1. remove toggle public project code;
2. modify the way to show role in public project list;
3. Change the way the change detection is default and remove actively refreshed code
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-11-12 17:50:08 +08:00
wang yan
f6ec05d18f Merge branch 'master' of https://github.com/goharbor/harbor into fix-immu-error-msg 2019-11-12 15:35:13 +08:00
AllForNothing
7f1201dec9 Fix tag select bug in tag component
Signed-off-by: AllForNothing <sshijun@vmware.com>
2019-11-12 14:32:01 +08:00
stonezdj
4d822e0a19 Fix review comments on PR9749
Fix review comments on PR9749
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-11-12 13:05:11 +08:00
wang yan
c6fecf75d8 update immutable tag error message format
Signed-off-by: wang yan <wangyan@vmware.com>
2019-11-12 12:51:17 +08:00
AllForNothing
d3da8776ff Fix UT bug for scanner component
Signed-off-by: AllForNothing <sshijun@vmware.com>
2019-11-12 11:03:30 +08:00
Wang Yan
407417ce7b
Merge pull request #9810 from stonezdj/bug9479
Populate group from auth provider to Harbor when user login
2019-11-11 19:52:31 +08:00
Will Sun
7e0b05434f
Merge pull request #9819 from AllForNothing/more-ut
Add more UT for scanner
2019-11-11 17:52:41 +08:00
Will Sun
0d2bf0a353
Merge pull request #9563 from AllForNothing/retention-case
Add nightly case for tag-retention
2019-11-11 17:52:26 +08:00
jwangyangls
b05c68b715
Merge pull request #9809 from jwangyangls/fix-ui-bug-by-test
Fix bug by ui test
2019-11-11 17:25:11 +08:00
sshijun
14364727ae Nightly case for tag-retention
Signed-off-by: sshijun <sshijun@vmware.com>
2019-11-11 16:58:33 +08:00
Will Sun
bb8fe1d059
Merge pull request #9807 from AllForNothing/round-2
Fix bugs for scanner UI testing round 2
2019-11-11 16:17:17 +08:00
Yogi_Wang
a833f12758 Fix bug by ui test
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-11-11 15:46:43 +08:00
Wenkai Yin(尹文开)
f49dafb674
Merge pull request #9816 from reasonerjt/role-id-in-project
Add role list in project response
2019-11-11 14:56:59 +08:00
stonezdj
0c011ae717 Populate group from auth provider to Harbor DB when user login
Fix #9749, change include LDAP auth, OIDC auth, HTTP auth

Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-11-11 14:41:35 +08:00
jwangyangls
2a4ade4aca
Merge pull request #9793 from jwangyangls/modify-scaner-nightly-case
Modify scaner nightly case
2019-11-11 14:41:23 +08:00
sshijun
1083d8f347 Fix bugs for scanner UI testing round 2
Signed-off-by: sshijun <sshijun@vmware.com>

Fix bugs for scanner UI testing round 2

Signed-off-by: sshijun <sshijun@vmware.com>
2019-11-11 14:37:17 +08:00
Daniel Jiang
64dc5122e6 Add role list in project response
This commit fixes #9771

It compares the roles to return the one with highest permission in the
response of `GET /api/projects`.
In addition to that, it adds the role list to the response, because a
user can have multiple roles in a project.
It also removes the togglable attribute as it's not used anywhere.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-11-11 14:03:50 +08:00
sshijun
22a1a7bb52 Add more UT for scanner
Signed-off-by: sshijun <sshijun@vmware.com>
2019-11-11 13:56:24 +08:00
Yogi_Wang
58936aae42 Modify nightly case of scanner
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-11-11 13:19:37 +08:00
Steven Zou
5cebfd17d2
Merge pull request #9811 from steven-zou/fix/issue_#9795_add_scan_by
add scan by info in the scan report summary
2019-11-09 09:24:23 +08:00
Daniel Jiang
7d04eab63c
Merge pull request #9593 from qyqcswill/code_improve
promote code quality
2019-11-08 18:28:46 +08:00
Wang Yan
6a99ceeebb
Merge pull request #9802 from wy65701436/disable-without-bearer
Disable policy check when pull without bearer token
2019-11-08 17:54:37 +08:00
Steven Zou
7bdf24961c add scan by info in the scan report summary
- fix #9795

Signed-off-by: Steven Zou <szou@vmware.com>
2019-11-08 17:35:39 +08:00
Will Sun
b1a756e34b
Merge pull request #9753 from AllForNothing/scan-all
Refactor scan all page UI
2019-11-08 16:47:38 +08:00
Will Sun
def11d1fea
Merge pull request #9764 from AllForNothing/bug-round-1
Fix bugs for scanner UI testing round 1
2019-11-08 16:31:47 +08:00
sshijun
2225417e1f Refactor scan all page
Signed-off-by: sshijun <sshijun@vmware.com>
2019-11-08 15:34:38 +08:00
sshijun
06013065ff Fix bugs for scanner UI testing round 1
Signed-off-by: sshijun <sshijun@vmware.com>
2019-11-08 14:56:48 +08:00
Wang Yan
9929780904
Merge pull request #9799 from wy65701436/fix-sort-immu-rule
Fix immutable rule sequence to list API
2019-11-08 14:19:29 +08:00
wang yan
415bdfa61f Disable policy check when pull without bearer token
This commit is to fix https://github.com/goharbor/harbor/issues/9780.
To align with OCI spec, when a docker pull request without bearer token in header comes in, Harbor should not intecepte it(return a 412 if check fail)
when the policy check is enabled. As the 401 is expected by the docker/caller, and then to ask token service which url is in the 401 header.

Signed-off-by: wang yan <wangyan@vmware.com>
2019-11-08 13:59:30 +08:00
jwangyangls
a2dcdf8948
Merge pull request #9739 from jwangyangls/fix-pull-time-sort
Fix the bug of cannot soft by pull time
2019-11-08 11:27:43 +08:00
Wenkai Yin(尹文开)
d60979cdd0
Merge pull request #9762 from steven-zou/fix/add_status_2_scan-call_metrics
add status data in the scan all metrics
2019-11-08 10:30:25 +08:00
jwangyangls
e546acf769
Merge pull request #8666 from Intermax-Cloudsourcing/extend-password-length
feat: Expand password length to unlimited
2019-11-08 10:06:08 +08:00
wang yan
cbc9414db8 Fix immutable rule sequence to list API
Signed-off-by: wang yan <wangyan@vmware.com>
2019-11-07 18:37:02 +08:00
Wenkai Yin
81e7b3b8ea Add adapter pattern for helm hub adapter
Add adapter pattern for helm hub adapter

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-11-07 16:40:49 +08:00
Steven Zou
a1d8c01cea add status data in the scan all metrics
Signed-off-by: Steven Zou <szou@vmware.com>

Signed-off-by: Steven Zou <szou@vmware.com>
2019-11-07 14:28:11 +08:00
Daniel Jiang
06e4e124d8
Refine request handle process (#9760)
* Refine request handle process

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-11-07 13:02:17 +08:00
Steven Zou
ee31418e8e revoke scan permission from the developer role
Signed-off-by: Steven Zou <szou@vmware.com>
2019-11-06 17:57:48 +08:00
Steven Zou
240f771006
Merge pull request #9733 from steven-zou/fix/scan_all_enhancements
do improvements to the scan all job
2019-11-05 16:22:50 +08:00
Steven Zou
ebc5d2482b do improvements to the scan all job
- update scan all job to avoid sending too many HTTP requets
- update scan controller to support scan options
- update the db schema of the scan report to introduce requester
- introduce scan all metrics to report the overall progress of scan all job
- fix the status updating bug in scan report
- enhance the admin job status updats
- add duplicate checking before triggering generic admin job
- update the db scheme of admin job

fix #9705
fix #9722
fix #9670

Signed-off-by: Steven Zou <szou@vmware.com>
2019-11-05 15:12:07 +08:00
Yogi_Wang
143f2a13b7 Fix the quoestion of cannot soft by pull time
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-11-05 14:05:24 +08:00
jwangyangls
473b453616
Merge pull request #9703 from jwangyangls/fix-replication-name-conflict
Fix a bug that when someone edits a rule with same name ,it displays the name is already in use
2019-11-04 18:22:06 +08:00
Yogi_Wang
03e54729c3 Fix bug of UI;
1.One of the request is cancelled when trying to do the multiple deletion for tags
2.when using other languages, switch languages, English button has default border
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-11-04 15:11:21 +08:00
jwangyangls
8cf5dba39a
Merge pull request #9696 from jwangyangls/fix-webhook-wrong-text
Modify the tootip words of verify remote cert.
2019-11-04 11:45:47 +08:00
Yogi_Wang
dd9a786b49 Modify the tootip of verify remote cert.
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-11-04 10:40:24 +08:00
Yogi_Wang
92cac6fd35 Fix a bug that when someone edits a rule with same name ,it displays the name is already in use
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-11-01 12:37:19 +08:00
Steven Zou
a928928a43
Merge pull request #9686 from heww/fix-project-severity-mapping
fix(policy-checker): add func to transform project severity to vuln.Severity
2019-11-01 11:12:13 +08:00
jwangyangls
a21349fc66
Merge pull request #9676 from jwangyangls/modify-ui-style-quota
Improve the style of quota ui
2019-11-01 11:10:49 +08:00
Daniel Jiang
f2beee16b1
Merge pull request #9673 from steven-zou/fix/issue_#9668_status_conflicts
return more clear error message for scan related API
2019-11-01 11:08:43 +08:00
Wenkai Yin(尹文开)
2101d7125c
Merge pull request #9680 from heww/install-clair-adapter-imporvement
fix(scanner): imporve clair adapter initializing
2019-11-01 10:42:04 +08:00
Will Sun
1c8105e837
Merge pull request #9663 from AllForNothing/nav-modify
Modify harbor-shell UI
2019-11-01 10:26:54 +08:00
sshijun
b4fa143aa4 Modify harbor-shell UI
Signed-off-by: sshijun <sshijun@vmware.com>
2019-11-01 09:31:33 +08:00
He Weiwei
ae8931e816 fix(policy-checker): add func to transform project severity to vuln.Severity
The severity saved in db is lowercase but the severities in vuln pkg
begin with upper letter, this fix use func to transform project severity
value from db to vuln.Severity.

Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-10-31 14:11:44 +00:00
wilmardo
1f79fb085b feat: Expand password length to unlimited
Signed-off-by: wilmardo <info@wilmardenouden.nl>
2019-10-31 15:01:27 +01:00
Steven Zou
eb8ec49f4f add UT cases for the common error pkg
Signed-off-by: Steven Zou <szou@vmware.com>
2019-10-31 21:55:27 +08:00
Daniel Jiang
bc65609a10
Merge pull request #9657 from wy65701436/quota-sync-switcher
add a switcher for quota sync on core launch
2019-10-31 19:22:23 +08:00
Wang Yan
fa784d7514
Merge pull request #9649 from wy65701436/fix-9081
add ldflags for harbor compiler and linker
2019-10-31 19:14:16 +08:00
Yogi_Wang
bdeddd4d95 Improve the style of quota ui
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-10-31 16:38:20 +08:00
wang yan
c46d7e856a add a switcher for quota sync on core launch
As the quota sync is default called by harbor-core on every launch, and it will break the launch process if any failure throwed.

1, The commit is to provide an switcher for the system admin to bypass the quota sync.
2, In case Harbor goes into the restarting cycle.

Harbor already provides an internal API to sync quota data, in the failure case,
system admin can launch harbor and call the /api/internal/syncquota to sync quota.

Signed-off-by: wang yan <wangyan@vmware.com>
2019-10-31 16:17:27 +08:00
He Weiwei
7170485a9b fix(scanner): imporve clair adapter initializing
1. Remove ping action when initialize clair adapter installed by harbor.
2. Remvoe the `IsDefault` property when initialize clair adapter that
make it switch to auto detecting.

Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-10-31 08:03:37 +00:00
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