Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-12-24 17:47:46 +01:00
Code Issues Projects Releases Wiki Activity
6,123 Commits 55 Branches 321 Tags 340 MiB
763c5df010
Commit Graph

6123 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Jiang
763c5df010 Add UT 
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2019-04-11 15:30:19 +08:00
Daniel Jiang
0d18e6c82f Update according to comments 
For more context see PR #7335

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2019-04-10 19:38:12 +08:00
Daniel Jiang
0a2343f542 Support secret for docker CLI 
As CLI does not support oauth flow, we'll use secret for help OIDC user
to authenticate via CLI.
Add column to store secret and token, and add code to support
verify/refresh token associates with secret.  Such that when the user is
removed from OIDC provider the secret will no longer work.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2019-04-10 19:38:11 +08:00
Daniel Jiang
08e00744be Fix misc bugs for e2e OIDC user onboard process 
This commit adjust the code and fix some bugs to make onboard process
work.
Only thing missed is that the UI will need to initiate the redirection,
because the request of onboarding a user was sent via ajax call and didn't
handle the 302.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2019-04-10 19:38:11 +08:00
stonezdj(Daojun Zhang)
0d3865c0e8
Merge pull request #7111 from wy65701436/robot-account-doc 
Add document for robot account
 2019-04-10 17:39:11 +08:00
Daniel Jiang
a243c7f05a
Merge pull request #7330 from wy65701436/reg-271 
Patch regsitry v2.7.1 with fix on distribution issue 2819
 2019-04-10 09:45:56 +08:00
wang yan
469473b31c Patch regsitry v2.7.1 with fix on distribution issue 2819 
This commit is to build a regsitry bases on v2.7.1 code and introduces
an fix on issue #2819, this is a P0 bug on v2.7.1 which causes GCS doesn't
work well on v2.7.1

For more details, refer to https://github.com/docker/distribution/pull/2821

Signed-off-by: wang yan <wangyan@vmware.com>
 2019-04-09 18:42:29 +08:00
Wenkai Yin
6df1320b0a
Merge pull request #7284 from cd1989/make-install-fix 
Fix make prepare problem
 2019-04-09 18:06:44 +08:00
wang yan
57e7305104 Update doc for Robot Accounts per review comments 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-04-09 17:09:20 +08:00
cd1989
92b04cffd5 Fix make prepare problem 
Signed-off-by: cd1989 <chende@caicloud.io>
 2019-04-09 17:02:09 +08:00
Qian Deng
fdf57f07f0
Merge pull request #7277 from ninjadq/refactor_config_file 
Refactor config file
 2019-04-09 15:48:15 +08:00
Qian Deng
deba378842 Enhance: Refacotr Registry config file 
1. Refactor registry configs
2. cp gcs keyfile is exist

Signed-off-by: Qian Deng <dengq@vmware.com>
 2019-04-09 14:40:41 +08:00
danfengliu
7c0273e5f9
Add a checkpoint in the end of key word <Add Guest Member To Project>, to make sure that the confirm button was click successfully, to see if this confirm button was dissappered after clicked. (#7320) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-04-09 13:41:56 +08:00
Qian Deng
74c4e243e3 Refator the host related config 
1. Refactor host config
2. Refactor certiface config
3. Add port config
4. Add log info config

Signed-off-by: Qian Deng <dengq@vmware.com>
 2019-04-09 12:55:07 +08:00
Qian Deng
fef7702e9a Enhance: Refactor the config parse logic 
Refactor the config parse logic

Signed-off-by: Qian Deng <dengq@vmware.com>
 2019-04-09 12:55:07 +08:00
Qian Deng
ac1b7bb1fb Enhance: remove the reload key item 
Remove the reload_config item in config file

Signed-off-by: Qian Deng <dengq@vmware.com>
 2019-04-09 12:55:07 +08:00
Qian Deng
cd65b68ab3 Enhance: Refactor the format 
Refactor the whole structure of harbor.yml

Signed-off-by: Qian Deng <dengq@vmware.com>
 2019-04-09 12:55:07 +08:00
Daniel Jiang
77ed9a871f Update CHANGELOG.md to make it up to date (#7315) 
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2019-04-09 12:27:47 +08:00
Wenkai Yin
855c0a2a6e
Merge pull request #7194 from stonezdj/remove_error_msg 
Remove error message of saving system setting to db
 2019-04-09 12:02:17 +08:00
danfengliu
0e0c691225
In project.robot, many element click or other action keywords missing retry, it will cause innessesary sleep in scripts. (#7274) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-04-09 10:44:24 +08:00
jwangyangls
a8ff6aa934
Merge pull request #7317 from jwangyangls/oidcRedirectToHarbor 
Add OIDC onboard page redirect to Harbor url when we login from OIDC
 2019-04-09 10:04:35 +08:00
stonezdj
e8ab7156bc Remove error message of saving system setting to db 
Signed-off-by: stonezdj <stonezdj@gmail.com>
 2019-04-08 18:16:18 +08:00
Yogi_Wang
eec55f18eb Add OIDC onboard page redirect to Harbor url when we login from OIDC and add redirect page address when we login again after logout 
1.when we are the first time we login harbor page when we login from OIDC  ,we add the url in onboard-add-username  page.
2.fix the part of issue that we cannot redirect to de origin page when we login

Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-04-08 16:30:32 +08:00
jwangyangls
ca846ad031
Merge pull request #7297 from jwangyangls/fix_oidc_ui_save 
Fix issue of oidc configuration save button is always disabled.
 2019-04-04 15:56:06 +08:00
Yogi_Wang
311af5d217 Fix issue of oidc configuration save button is always disabled and incorrect character 
when we login Harbor width OIDC ,we cannot click the save  button of oidc config page

Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-04-04 14:34:18 +08:00
jwangyangls
a27df46fb6
Merge pull request #7292 from jwangyangls/fix_login_robot_issue 
Fix nightly test case failed when login harbor.
 2019-04-04 12:14:43 +08:00
Yogi_Wang
4416e1810e fix login harbor issue with test case 
Solve the problem that when we log on to the harbor page, the automation test will click on an incorrect button, which results in the test page being unable to log in.

Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-04-04 09:58:46 +08:00
Yan
da0e20ec60
Add controller to onboard oidc user (#7286) 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-04-03 20:47:22 +08:00
Mia ZHOU
f73f926449
Merge pull request #7265 from pureshine/move-scan/gc 
Move GC and Vulnerability to Tasks
 2019-04-03 16:41:57 +08:00
Fangyuan Cheng
89b72906f4
Merge branch 'master' into move-scan/gc 2019-04-03 16:07:35 +08:00
Wenkai Yin
0c171c642b
Merge pull request #7244 from wy65701436/oidc_user 
add the dao funcs for OIDC onboard user
 2019-04-03 15:23:05 +08:00
FangyuanCheng
82716d492d move vulnerability and gc ui 
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
 2019-04-03 14:39:46 +08:00
jwangyangls
beeb8b53d7
Merge pull request #7281 from jwangyangls/oidc_step3_onboard_tpl 
Add the OIDC onboard page
 2019-04-03 14:11:25 +08:00
wang yan
dcf1d704e6 fix dao UT issue and refine the error of onboard OIDC user 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-04-03 14:05:18 +08:00
jwangyangls
cf391e74ad
Merge pull request #7267 from jwangyangls/oidc_step2_onboard 
Add links to OIDC login
 2019-04-03 13:18:18 +08:00
Yogi_Wang
3bf644012c Add the OIDC onboard page 
When a user logs in to Harbor for the first time through OIDC, the user will enter an onboard page, prompting the user to add the user name of Harbor. After the user name is entered, click save, and the user successfully logs in to Harbor through OIDC.

Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-04-03 12:58:11 +08:00
Yogi_Wang
da3620816f Add links to OIDC login 
In the login page ,we add button to jump to OIDC login page.

Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-04-03 12:33:18 +08:00
wang yan
41018041f7 remove oidc controller and add more UTs 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-04-03 09:54:21 +08:00
Yan
0de5999f52 add the controller for ocdi onboard user 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-04-03 09:52:22 +08:00
Wenkai Yin
8d6299fed9
Merge pull request #7257 from reasonerjt/oidc-controllers-p2 
Add callback controller for OIDC
 2019-04-02 13:37:00 +08:00
Qian Deng
e93d931834
Merge pull request #7268 from ninjadq/fix_clair_env_none_issue 
Fix: clair env file should using empty string is not exist
 2019-04-02 10:25:26 +08:00
Daniel Jiang
76ea48d47b
Merge pull request #6997 from daixiang0/update-doc 
docs/README.md: update old url
 2019-04-02 10:08:10 +08:00
Qian Deng
15c2c9048f Fix: clair env file should using empty string is not exist 
This is quick fix, further fixs will in the config refactor PR

Signed-off-by: Qian Deng <dengq@vmware.com>
 2019-04-01 18:12:34 +08:00
jwangyangls
a06d711edd
Merge pull request #7251 from jwangyangls/OIDC_step1 
Oidc step1--Configuration enables users to change information after login through OIDC
 2019-04-01 14:42:18 +08:00
Yogi_Wang
363d8dd208 Configuration enables users to change information after login through OIDC provider smoothly. 
In the configration auth mode section, we add an option, OIDC.When the user logs in using OIDC mode, the system defaults to auth mode to select OIDC, where the user can modify the name, endpoint, scope, clientId, clientSecret and skipCertVerify of the OIDC. After the modification, the user clicks the Save button to save the changes
Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-04-01 13:13:02 +08:00
Daniel Jiang
587acd33ad Add callback controller for OIDC 
This commit add callback controller to handle the redirection from
successful OIDC authentication.
For E2E case this requires callback controller to kick off onboard
process, which will be covered in subsequent commits.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2019-04-01 12:35:31 +08:00
Daniel Jiang
4b82b0e364
Merge pull request #7245 from zhoumeina/update_guide 
add new version info for contributing guide
 2019-03-29 17:16:25 +08:00
Meina Zhou
c59e0b2aeb add new version info for contributing guide 
Signed-off-by: Meina Zhou <meinaz@vmware.com>
 2019-03-29 14:12:52 +08:00
Fangyuan Cheng
a2051354c6
Merge pull request #7232 from pureshine/cron-validator 
Add cron regular expression
 2019-03-29 10:23:40 +08:00
Daniel Jiang
f6820b5ae3
Merge pull request #7242 from reasonerjt/oidc-controllers 
Add controller to handle oidc login
 2019-03-29 00:50:26 +08:00