Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-12-26 10:38:00 +01:00
Code Issues Projects Releases Wiki Activity
6,095 Commits 55 Branches 321 Tags 340 MiB
da0e20ec60
Commit Graph

6095 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Daniel Jiang
49aae76205 Onbard settings for OIDC provider (#7204) 
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2019-03-25 12:24:39 +08:00
Yogi_Wang
309696b575 movoHelmChartIssue 
Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-03-25 11:11:10 +08:00
FangyuanCheng
dada47c07e Refactoring vulnerability ui support cron 
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
 2019-03-23 20:58:45 +08:00
Qian Deng
df2425a02b Fix: upgrade pyyaml version to 4.2b1 
Because previous version has security issue

Signed-off-by: Qian Deng <dengq@vmware.com>
 2019-03-22 19:05:16 +08:00
Qian Deng
e538a4c448 Fix: install.sh failure if $host env is setted (#7203) 
Fix sed replace cmd

Signed-off-by: Qian Deng <dengq@vmware.com>
 2019-03-22 19:04:40 +08:00
Yan
8d3946a0e2
Refactor scan all api (#7120) 
* Refactor scan all api

This commit is to let scan all api using admin job to handle schedule
management. After the PR, GC and scan all share unified code path.

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

* update admin job api code according to review comments

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

* Update test code and comments per review

Signed-off-by: wang yan <wangyan@vmware.com>
 2019-03-22 17:52:21 +08:00
Mia ZHOU
05e0289f84
Merge pull request #7200 from jwangyangls/movoHelmChartAndOptimizationUserPermission 
moveHelmChart
 2019-03-22 16:48:21 +08:00
Yogi_Wang
3f9fd7010a movoHelmChart 
Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-03-22 15:52:13 +08:00
Qian Deng
ba4764c61d
Merge pull request #6755 from ninjadq/refactor_prepare 
Refactor the prepare script
 2019-03-22 14:54:30 +08:00
Qian Deng
fcdab4d4af Fix: packaging offline in new prepare 
This new prepare script now support offline packaging

Signed-off-by: Qian Deng <dengq@vmware.com>
 2019-03-22 13:56:15 +08:00
Wenkai Yin
8e870de976
Merge pull request #7192 from heww/fix-users-api-pagination 
Fix pagination for users and users search apis
 2019-03-21 14:16:12 +08:00
He Weiwei
79235fffd1 Fix pagination for users and users search apis 
Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2019-03-21 13:03:30 +08:00
Mia ZHOU
204c139dbd
Merge pull request #7166 from ninjadq/oracle_ldap_support 
Add membership item in LDAP config
 2019-03-21 08:35:42 +08:00
Daniel Jiang
42ab5fb681
Merge pull request #7184 from wy65701436/master 
Remove unused files from vendor by dep v0.5.1
 2019-03-20 20:23:36 +08:00