Commit Graph

6109 Commits

Author SHA1 Message Date
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
danfengliu
3db3f3a62e
add test cases for jenkins upgrade project, wrap test cases body into new keywords, so that case body appears only in one single place (#7243)
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-03-28 14:37:03 +08:00
FangyuanCheng
5dd200fa00 cron validator
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-03-28 13:25:25 +08:00
Qian Deng
d81dabc208
Merge pull request #7240 from ninjadq/fix_upstream_config_file_of_notary
Fix: copy upstream file to nginx config file
2019-03-28 13:23:43 +08:00
Daniel Jiang
9ce98f4acd Add controller to handle oidc login
The controller will redirect user to the OIDC login page based on
configuration.
Additionally this commit add some basic code to wrap `oauth2` package
and `provider` in `go-oidc`, and fixed an issue in UT to make
InMemoryDriver for config management thread-safe.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-03-28 11:29:05 +08:00
Fangyuan Cheng
2787306d47
Merge pull request #7076 from cd1989/update-api-basepath
Use baseURL from config
2019-03-28 09:40:23 +08:00
Qian Deng
cb846bd936 Fix: copy upstream file to nginx config file
Copy notary.upstream.conf to nginx config file

Signed-off-by: Qian Deng <dengq@vmware.com>
2019-03-27 17:56:31 +08:00
danfengliu
6b19b99c97
test case Disable Scan Schedule failed at page should contain part, it missing wait until and retry, so add one (#7228)
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-03-27 15:33:31 +08:00
Yan
03709e4ec1
add authn proxy (#7199)
* add authn proxy docker login support

User could use the web hook token issued by k8s api server to login to harbor.
The username should add a specific prefix.

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

* update code per review comments

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

* Add UT for auth proxy modifier

Signed-off-by: wang yan <wangyan@vmware.com>
2019-03-27 12:37:54 +08:00
Qian Deng
7d0f77e986
Merge pull request #7234 from wy65701436/update-node
Upgrade node version to 10.15
2019-03-27 11:16:11 +08:00
wang yan
1ba1c5726a Upgrade node version to 10.15
To fix the issue https://lists.debian.org/debian-devel-announce/2019/03/msg00006.html,
it needs to upgrade node to 10.15, which has pitched the fix.

Signed-off-by: wang yan <wangyan@vmware.com>
2019-03-27 10:47:13 +08:00
Qian Deng
215149fc2f
Merge pull request #7206 from ninjadq/update_pyyaml_version
Fix: upgrade pyyaml version to 4.2b1
2019-03-26 15:11:42 +08:00
Mia ZHOU
542c460e3d
Merge pull request #7214 from jwangyangls/fixHelmChartIssue
moveHelmChartIssue
2019-03-26 10:25:37 +08:00
Fangyuan Cheng
37ddaf9ecf
Merge pull request #7138 from pureshine/vul-cron
Refactoring vulnerability ui support cron
2019-03-25 12:30:28 +08:00