Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-12-18 06:38:19 +01:00
Code Issues Projects Releases Wiki Activity
6,431 Commits 55 Branches 319 Tags 338 MiB
e4506604e2
Commit Graph

2416 Commits

Author SHA1 Message Date
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
5219073c49 Call Harbor API to delete the images in Harbor adapter 
Call Harbor API to delete the images in Harbor adapter to avoid the inconsistent between the different versions of Harbor

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-04-02 17:02:15 +08:00
Wenkai Yin
4484bca756 Fix replication related issues 
1. Add operation property for tasks
2. Add trigger property for executions
3. Update the getting registry info API to allow passing 0 as ID to get the info of local Harbor registry

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-04-02 14:26:17 +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
Wenkai Yin
18dbd807a4
Merge pull request #7270 from ywk253100/190401_transport 
Provide a util function to return a common HTTP transport
 2019-04-02 07:24:53 +08:00
Wenkai Yin
b42ae1c994 Provide a util function to return a common HTTP transport 
1. Provide a util function to return a shared HTTP transport
2. Read secretkey from the configuration of replication

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-04-01 19:52:37 +08:00
Wenkai Yin
74efee569e Update the registry client to support pulling public images from docker hub without login 
Only add the authentication info when the username is provided to support pulling public images from docker hub without login

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-04-01 19:15:07 +08:00
Wenkai Yin
df2ae63308
Merge pull request #7262 from ywk253100/190401_harbor_adapter 
Use the secret to auth the replication for local Harbor
 2019-04-01 17:26:56 +08:00
Wenkai Yin
bd2308b91a Use the secret to auth the replication for local Harbor 
1. Use the secret to do the auth between the components when replicating
2. Handle internal core URL and token service URl when the instance is local Harbor

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-04-01 16:24:06 +08:00
Wenkai Yin
d6eb700077
Merge pull request #7264 from mmpei/replication_ng_bugfix_endtime 
Fix execution end time bug
 2019-04-01 16:09:16 +08:00
peimingming
92488bd27e Fix execution end time bug 
Signed-off-by: peimingming <peimingming@corp.netease.com>
 2019-04-01 14:28:01 +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
FangyuanCheng
cb438d0029 Update replication data 
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
 2019-03-31 23:26:26 +08:00
Wenkai Yin
82e02fc734
Merge pull request #7254 from ywk253100/190329_api 
Update the replication API
 2019-03-30 21:28:38 +08:00
Wenkai Yin
71b706e60a Update the replication API 
1. Add getting execution by ID API
2. Return registry detail info in listing policies API

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-03-30 20:46:02 +08:00
FangyuanCheng
163909579e fix get adapter bug 
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
 2019-03-29 18:27:00 +08:00
Wenkai Yin
1491cf1846
Merge pull request #7224 from pureshine/replication_ng 
Refactor replication-task page according to the new design
 2019-03-29 17:19:31 +08:00
FangyuanCheng
0b7f68388f Refactor replication-task page 
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
 2019-03-29 15:33:42 +08:00
Wenkai Yin
8c7b63bac2
Merge pull request #7248 from ywk253100/190326_event 
Add event based trigger and scheduled trigger
 2019-03-29 14:58:09 +08:00
Wenkai Yin
4f8e283e8e Add event based trigger and scheduled trigger 
This commit implements the event based trigger and scheduled trigger in replilcation

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-03-29 13:48:34 +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
FangyuanCheng
5dd200fa00 cron validator 
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
 2019-03-28 13:25:25 +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
Wenkai Yin
c0faa9d4aa
Merge pull request #7227 from zhoumeina/replication_ng 
add filter logic
 2019-03-28 08:43:43 +08:00
Wenkai Yin
0e9bdbc09c
Merge pull request #7225 from ywk253100/190326_structure 
Adjust the file structure of replication package
 2019-03-27 13:08:05 +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
Wenkai Yin
017bba8dc1 Merge remote-tracking branch 'upstream/master' into 190327_sync 2019-03-27 11:43:51 +08:00
Meina Zhou
d9bff2f269 add filter logic 
Signed-off-by: Meina Zhou <meinaz@vmware.com>
 2019-03-26 17:09:23 +08:00
Wenkai Yin
de4eb0369a Adjust the file structure of replication package 
Move the scheduler, execution, hook and flow package into operation

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-03-26 14:59:58 +08:00
Wenkai Yin
690f868d15
Merge pull request #7216 from zhoumeina/replication_ng 
Create replication rule -- remove project logic and add dynamic trigger logic.
 2019-03-26 10:39:05 +08:00
Mia ZHOU
542c460e3d
Merge pull request #7214 from jwangyangls/fixHelmChartIssue 
moveHelmChartIssue
 2019-03-26 10:25:37 +08:00
Meina Zhou
2df11a773e add trigger logic and remove project code 
Signed-off-by: Meina Zhou <meinaz@vmware.com>
 2019-03-25 14:19:47 +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
Meina Zhou
b0ce3da8bd remove the project related code 
Signed-off-by: Meina Zhou <meinaz@vmware.com>
 2019-03-25 10:20:55 +08:00
FangyuanCheng
dada47c07e Refactoring vulnerability ui support cron 
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
 2019-03-23 20:58:45 +08:00
Wenkai Yin
b37f4018a6 Update the registry adapter interface 
This commit adds the Info() method to the registry adapter interface

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-03-23 07:49:59 +08:00
Wenkai Yin
679b0d3d6a Convert job status to replication task status 
This commits converts job status to task status

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-03-22 18:16:27 +08:00
Wenkai Yin
39485efc9a
Merge pull request #7212 from ywk253100/190324_sync 
Sync with master branch
 2019-03-24 14:18:23 +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
Wenkai Yin
49cf50adb1 Merge remote-tracking branch 'upstream/master' into 190324_sync 
Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-03-22 15:55:52 +08:00
Wenkai Yin
791aecddfa
Merge pull request #7210 from ywk253100/190321_delete 
Add support for replicating the delation of resource
 2019-03-23 20:08:13 +08:00
Yogi_Wang
3f9fd7010a movoHelmChart 
Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-03-22 15:52:13 +08:00
Wenkai Yin
c3b02dd104 Implement deletion for image transter 
This commit implements the delete function for image transfer

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-03-22 15:44:35 +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
Wenkai Yin
1120368c9c Add support for replicating the delation of resource 
This commit refines the replication flows and provides the support for replicating resource deletion

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-03-22 12:37:39 +08:00
FangyuanCheng
7b7cc5c0a3 fix bug 
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
 2019-03-21 16:14:09 +08:00
Meina Zhou
80b8440564 fix unit test 
Signed-off-by: Meina Zhou <meinaz@vmware.com>
 2019-03-21 14:58:47 +08:00
Meina Zhou
130e132f86 Merge branch 'master' into replication_ng 
Signed-off-by: Meina Zhou <meinaz@vmware.com>
 2019-03-21 14:16:33 +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
Meina Zhou
90c28198eb add validation message 
Signed-off-by: Meina Zhou <meinaz@vmware.com>
 2019-03-21 12:24:35 +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
Wenkai Yin
224f059993
Merge pull request #7183 from ywk253100/190320_filter 
Update listing/getting replication adapter API
 2019-03-20 18:50:18 +08:00
wang yan
25d1e69802 Remove unused files from vendor by dep v0.5.1 
As for dep upgrade to v0.5.1, it removes all of unused files for vendor.

Signed-off-by: wang yan <wangyan@vmware.com>
 2019-03-20 18:27:26 +08:00
FangyuanCheng
03c9bf8ceb new endpoint 
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
 2019-03-20 14:52:40 +08:00
Wenkai Yin
bb76a4d97d
Merge pull request #7178 from ywk253100/190315_chart 
Replicate helm charts
 2019-03-20 14:29:35 +08:00
Meina Zhou
242406ce47 modify create replication rule 
Signed-off-by: Meina Zhou <meinaz@vmware.com>
 2019-03-20 13:51:47 +08:00
Wenkai Yin
f78fd54d96
Merge branch 'replication_ng' into registry-management 2019-03-20 11:50:04 +08:00
FangyuanCheng
839f68f5fc replication-ng 
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
 2019-03-20 10:53:27 +08:00
Wenkai Yin
c65d5e6669 Update listing/getting replication adapter API 
This commit updates the listing/getting replication adapter API

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-03-20 05:30:15 +08:00
Wenkai Yin
fb394c2c7a Replicate helm charts 
This commit provides the capability for Harbor to replicate helm charts

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-03-20 00:35:15 +08:00
Wenkai Yin
08c20c5ca5
Merge pull request #7170 from wy65701436/gc-untagged 
Enable docker registry to clean untagged revisions
 2019-03-19 18:01:30 +08:00
Daniel Jiang
a73b499988 Expose HTTP auth proxy infor in systeminfo API (#7164) 
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2019-03-19 15:54:40 +08:00
wang yan
44c290c0ed Enable docker registry to clean untagged revisions 
As registry v2.7.1 has introduced the possibility to clean untagged manifests,
enable it in the registryctl api.

Signed-off-by: wang yan <wangyan@vmware.com>
 2019-03-19 15:13:00 +08:00
Yogi_Wang
c84d55f1f8 fix 6951 user permission is project Admin the user list donot show when user input 
Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-03-19 13:42:36 +08:00
Qian Deng
ea6989847f Add membership item in LDAP config 
Add a item ldap_membership to LDAP config

Signed-off-by: Qian Deng <dengq@vmware.com>
 2019-03-19 10:45:43 +08:00
Wenkai Yin
79217e2485
Merge branch 'replication_ng' into replication_ng_execution_upgrade 2019-03-18 18:12:22 +08:00
jwangyangls
7ae7f9f23f
Merge pull request #7135 from jwangyangls/PromiseToObservable 
change promise to observable
 2019-03-18 13:11:04 +08:00
Yogi_Wang
b16711f4f7 change promise to observable 
Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-03-18 12:32:57 +08:00
peimingming
3f64a3b337 Execution updateStatus logic upgrade 
Signed-off-by: peimingming <peimingming@corp.netease.com>
 2019-03-15 16:21:39 +08:00
stonezdj(Daojun Zhang)
7060747d5b ldap_url and ldap_base_dn not exist in user config (#7115) 
Signed-off-by: stonezdj <stonezdj@gmail.com>
 2019-03-15 15:20:12 +08:00
wang yan
73d68903d6 update robot account return attribute 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-03-14 13:57:50 +08:00
Wenkai Yin
cabef73980 Add Harbor adapter for replication 
Implement the replication adapter for Harbor registry

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-03-13 21:39:39 +08:00
peimingming
4efad287ce Add execution and hooks 
Signed-off-by: peimingming <peimingming@corp.netease.com>
 2019-03-13 09:35:01 +08:00
Wenkai Yin
185525e9c8 Implement a default image registry client 
Provide a default implemmentation for image registry interface, other adapters can use it directly

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-03-12 20:21:58 +08:00
Wenkai Yin
7ab21db26a Update the job ID in flow controller 
Update the job ID for the task if it is scheduled successfully

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-03-12 15:42:16 +08:00
Wenkai Yin
772367498f Merge remote-tracking branch 'upstream/master' into 190311_sync 2019-03-11 20:34:49 +08:00
FangyuanCheng
e32a34048a Fix returning internal error when setting cron for gc 
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
 2019-03-11 15:43:46 +08:00
Wenkai Yin
258b22a9a5 Fix bug in replication 
This commit fixes bugs found in the implement of replciation NG

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-03-10 20:57:59 +08:00
Wenkai Yin
d1f4c20e64 Implement replication policy management API 
This commit implements the replication policy management API

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-03-09 01:32:51 +08:00
Wenkai Yin
272508e509 Provide a null implementation for Harbor adapter 
This commit provides a null implementation for Harbor adapter to fill data for the listing adapter API

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-03-09 01:10:25 +08:00
慕薇疯魔
1039800fa9 1. Migration for policy manager. 
2. Clear test database after run test.
3. UT for policy manager and dao.

Signed-off-by: 慕薇疯魔 <kfanjian@gmail.com>
 2019-03-11 16:01:31 +08:00
Frank Kung
5bd5d59a4f 1. Define ng persist replication policy model. 
2. Add ng replication policy CURD methods.
3. Implement ng policy manger.

Signed-off-by: Frank Kung <kfanjian@gmail.com>
Signed-off-by: 慕薇疯魔 <kfanjian@gmail.com>
 2019-03-11 11:13:10 +08:00
Qian Deng
5f80fe7b8a Refacotr the prepare script base on the proposal https://github.com/goharbor/community/pull/22 
Signed-off-by: Qian Deng <dengq@vmware.com>
 2019-03-08 16:46:13 +08:00
Wenkai Yin
0b08291a2f
Merge branch 'replication_ng' into 190227_adapter_interface 2019-03-08 13:01:39 +08:00
Wenkai Yin
6742e0ceda Refactor the adapter interface 
This commit refactors the Adapter interface and adjust the code in the flow controller and repository handler

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-03-08 12:26:17 +08:00
Wenkai Yin
ec2a7f9239 Implement replication operation API 
This commit implements the replication operation related APIs

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-03-08 10:06:33 +08:00
jwangyangls
fc0654f028
Merge pull request #7088 from jwangyangls/proxyAuthenticator 
add http auth proxy selection in system configuration
 2019-03-07 17:26:59 +08:00
Fangyuan Cheng
41f443d3e3
Merge pull request #7083 from pureshine/support-cron 
Refactoring gc ui support cron
 2019-03-07 16:52:44 +08:00
Yogi_Wang
e281b6523e add http auth proxy selection in system configuration 
Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-03-07 16:52:17 +08:00
Wenkai Yin
db7a709aad
Merge pull request #7063 from heww/users-search 
Add users search API
 2019-03-07 15:58:26 +08:00
FangyuanCheng
0d242fc0ba Refactoring gc ui support cron 
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
 2019-03-07 13:31:09 +08:00
stonezdj(Daojun Zhang)
f7745baf30
Merge pull request #6599 from stonezdj/pr6161 
Add new parameter ldap_group_membership_attribute (PR#6161)
 2019-03-07 13:26:26 +08:00
He Weiwei
20556aebd2 Add users search API 
Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2019-03-07 12:47:26 +08:00
Wenkai Yin
7f49151115 Implement replication adapter API 
This commit implements the replication adapter API

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-03-06 15:01:33 +08:00
Daniel Jiang
002094dbbb
Merge pull request #7075 from wy65701436/cron-str 
update gc api to support raw cron string
 2019-03-06 13:36:52 +08:00
Qian Deng
b68f09cf41 Fix: global search not work when chart enabled 
Global search result data does not contain the chart info when chart is empty

Signed-off-by: Qian Deng <dengq@vmware.com>
 2019-03-06 10:37:41 +08:00
wang yan
e373167546 update gc api to support raw cron string 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-03-05 16:31:35 +08:00
De Chen
2bc2a44db8
Merge branch 'replication_ng' into registries-management 2019-03-05 16:22:34 +08:00
cd1989
b00098d492 Add unit tests and fix CI 
Signed-off-by: cd1989 <chende@caicloud.io>
 2019-03-05 15:37:36 +08:00
Wenkai Yin
937ee46ae0
Merge branch 'replication_ng' into replication_ng 2019-03-05 15:20:21 +08:00
stonezdj(Daojun Zhang)
dffb971366
Merge pull request #7055 from stonezdj/bug7038 
Remove verify_remote_cert
 2019-03-05 14:54:02 +08:00
cd1989
b851c3476a Use baseURL from config 
Signed-off-by: cd1989 <chende@caicloud.io>
 2019-03-05 14:30:06 +08:00
stonezdj
4dfee0c1f0 Remove verify_remote_cert 
Signed-off-by: stonezdj <stonezdj@gmail.com>
 2019-03-05 14:04:10 +08:00
Wenkai Yin
77688c90b9
Merge pull request #7061 from stonezdj/bug6767 
Search local DB first when adding a project member with username
 2019-03-05 12:56:19 +08:00
Mia ZHOU
76a07eb5fe
Merge pull request #7059 from ninjadq/fix_global_search_issue 
Fix global search issue
 2019-03-05 08:41:30 +08:00
Mia ZHOU
ccf6280365
Merge pull request #7066 from ninjadq/fix_charts_count_displayed_when_disable 
Fix: Should not display helm chart counts if it's not enabled
 2019-03-05 08:40:23 +08:00
Qian Deng
4ba012ab8e Fix: global search not work issue 
Both Frontend and Backend should not send chart data when chartmusuem not enabled

Signed-off-by: Qian Deng <dengq@vmware.com>
 2019-03-04 17:44:34 +08:00
Qian Deng
b6fea75099 Fix: Should not display helm chart counts if it's not enabled 
Should not display the counts of chart if it's not enabled

Signed-off-by: Qian Deng <dengq@vmware.com>
 2019-03-04 17:36:27 +08:00
Mia ZHOU
685e590514
Merge pull request #7062 from jwangyangls/userListPermission 
fix get users list about permission issue
 2019-03-04 16:46:09 +08:00
Yogi_Wang
1e17036b04 fix get user list about permission issue 
Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-03-04 14:59:06 +08:00
stonezdj
3fdc0fd9ba Search local DB first when adding a project member with username 
Signed-off-by: stonezdj <stonezdj@gmail.com>
 2019-03-04 11:22:37 +08:00
stonezdj
cf134bc80e Add new parameter ldap_group_membership_attribute 
Signed-off-by: stonezdj <stonezdj@gmail.com>
 2019-03-03 10:03:22 +08:00
Daniel Jiang
321874c815 Move Settings of HTTP auth proxy (#7047) 
Previously the settings of HTTP authproxy were set in environment
variable.
This commit move them to the configuration API

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2019-03-01 14:11:14 +08:00
Fangyuan Cheng
f79895b6d8
Merge pull request #7034 from pureshine/robot-expiration 
Implement Robot account expiration
 2019-03-01 10:04:26 +08:00
jwangyangls
b3c4d1688d
Merge pull request #7011 from jwangyangls/fix_6950 
fix 6950 about the default option is not displayed When we click the add-member button, the default option is not displayed.
 2019-02-28 14:07:07 +08:00
He Weiwei
053a18a490 Skip transfer blob for foreign layers 
Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2019-02-27 16:14:17 +08:00
FangyuanCheng
a2cd2e50fc Implement Robot account expiration 
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
 2019-02-27 14:16:07 +08:00
cd1989
8732a20709 Rewrite registry manager with new interface 
Signed-off-by: cd1989 <chende@caicloud.io>
 2019-02-27 11:54:04 +08:00
cd1989
6bdf3053a7 Implement registries manager 
Signed-off-by: cd1989 <chende@caicloud.io>
 2019-02-27 11:54:04 +08:00
Wenkai Yin
95888b3dc2
Merge branch 'replication_ng' into 190130_transfer_repo 2019-02-27 11:00:42 +08:00
Yuan Lei
253600ad39 sync from upstream and merge the conflic 
Signed-off-by: Yuan Lei <371304458@qq.com>
 2019-02-27 10:52:03 +08:00
Wenkai Yin
79d34c6f80 Create dao folder in replication 
This commit creates a new folder called dao under replication to hold dao codes

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-02-26 14:54:16 +08:00
Daniel Jiang
f69e4f9a4a
Merge pull request #7004 from wy65701436/robot-expiration-time 
add expiration of robot account
 2019-02-25 13:48:11 +08:00
Yogi_Wang
11d7989ee3 fix_6950 
Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-02-25 12:36:03 +08:00
wang yan
91aa67a541 Update expiration variable name to expiresat/tokenduration 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-02-25 11:55:42 +08:00
zhoulin xie
b2ed619e1e Fix some misspells in code 
Signed-off-by: zhoulin xie <zhoulin.xie@daocloud.io>
 2019-02-24 01:43:53 +08:00
wang yan
36a778b482 Update expiration schema to bigint and default unit to minute 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-02-22 18:42:43 +08:00
wang yan
47a09b5891 add expiration of robot account 
This commit is to make the expiration of robot account configurable

1, The expiration could be set by system admin in the configuation page or
by /api/config with robot_token_expiration=60, the default value is 30 days.
2, The expiration could be shown in the robot account infor both on UI and API.

Signed-off-by: wang yan <wangyan@vmware.com>
 2019-02-22 18:42:34 +08:00
stonezdj(Daojun Zhang)
4cb49e5388
Merge pull request #6963 from stonezdj/remove_container 
Remove everything of adminserver container
 2019-02-22 18:27:43 +08:00
stonezdj
0cba36d79f Remove everything of adminserver 
Signed-off-by: stonezdj <stonezdj@gmail.com>
 2019-02-22 16:34:39 +08:00
Nguyen Quang Huy
eda6c47b3e add signoff for DCO gate (#6981) 
Some variable name, function name is colliding with builtin function.

Signed-off-by: Nguyen Quang Huy <huynq0911@gmail.com>
 2019-02-22 15:00:18 +08:00
Wenkai Yin
8894a27d2d Implement the operation controller 
This commit implements the operation controller. The operation controller wraps the flow controller and execution manager to provide capabilities for the upper level

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-02-22 10:12:14 +08:00
Wenkai Yin
a3e4772fe9
Merge pull request #6983 from reasonerjt/new-bump-up-notary-migrate 
Bump up the migrate tool of notary
 2019-02-21 18:03:17 +08:00
Daniel Jiang
1832699e93 Bump up the migrate tool of notary 
fixes #5863
The migrate binary that we include in notary is quite out dated.
Additionally it introduced a breaking change, more details see #5863

In this commit a go program was added to workaround this issue to ensure the
migration process works, and refined bootstrap scripts and make process accordingly.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2019-02-21 00:36:24 -08:00
Daniel Jiang
321adc8362
Merge pull request #6941 from ywk253100/190213_replication_policy 
Fix #6698: cannot create a same name replication policy after deleting it
 2019-02-21 16:03:55 +08:00
Wenkai Yin
e3a9264162 Refactor the Scheduler interface 
This commit refactors the Scheduler interface and does the corresponding changes to the flow controller

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-02-21 15:34:57 +08:00
Wenkai Yin
0c0c833dda Merge remote-tracking branch 'upstream/master' into 190220_sync 2019-02-20 17:21:38 +08:00
jwangyangls
c8c0ee623d
Merge pull request #6954 from jwangyangls/skipped_tests_fix 
fix_skipped_tests
 2019-02-20 10:13:18 +08:00
Yogi_Wang
60aecf2a1a fix_skipped_tests 
Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-02-19 09:43:23 +08:00
stonezdj
7a5fbf718f Revise code with review comments 
Signed-off-by: stonezdj <stonezdj@gmail.com>
 2019-02-18 15:20:54 +08:00
stonezdj
880051c08a Add load for user settings in core/config/config.go 
Signed-off-by: stonezdj <stonezdj@gmail.com>
 2019-02-18 14:06:19 +08:00
stonezdj
36e1c13a43 fix ut error in systeminfo_test.go 
Signed-off-by: stonezdj <stonezdj@gmail.com>
 2019-02-18 14:06:19 +08:00
stonezdj
1ae5126bb4 Refactor adminserver stage 3: replace config api and change ut settings 
Signed-off-by: stonezdj <stonezdj@gmail.com>
 2019-02-18 14:06:19 +08:00
Yuan Lei
7108b5c58c update scheduler interface to follow the new standard 
Signed-off-by: Yuan Lei <371304458@qq.com>
 2019-02-18 11:40:58 +08:00
Wenkai Yin
f0f2e77fb4 Implement the repository transfer 
This commit implements the Transfer interface for resource repository

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-02-15 17:49:35 +08:00
Yogi_Wang
4ee5ebe442 skipped_tests_fix 
Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-02-15 16:52:34 +08:00
jwangyangls
d28b8355ef
Merge pull request #6930 from jwangyangls/issue-6923 
fix issue 2923
 2019-02-15 15:53:51 +08:00
Wenkai Yin
530ba1d27b Fix #6698 
This commit fixes the issue #6698: cannot create a same name replication policy after deleting it

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-02-15 15:17:48 +08:00
jwangyangls
0891300d21
Merge pull request #6927 from jwangyangls/harbor_style_change 
change_style and datagrid refresh interface change
 2019-02-15 15:04:52 +08:00
Wenkai Yin
4ceaf3e6c9 Merge remote-tracking branch 'upstream/master' into 190215_syncmaster 2019-02-15 14:15:00 +08:00
Yogi_Wang
a9db2ab943 fix issue 2923 
Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-02-15 10:23:53 +08:00
Yogi_Wang
651a142429 change_style_unitTest 
Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-02-14 16:38:05 +08:00
Meina Zhou
0d239cb1cb move gc to lib and add in registry config 
Signed-off-by: Meina Zhou <meinaz@vmware.com>
 2019-02-14 13:45:15 +08:00
Wenkai Yin
e12da7264a Implement the replication flow controller 
1. Implement the replication flow controller
2. Implement the registry adapter management
3. Define the interface for PolicyManager, RegistryManager, ExecutionManager, TaskManager and Scheduler

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-02-14 11:34:12 +08:00
Yogi_Wang
06eaa304da fixed_ciIssue 
Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-02-14 10:21:18 +08:00
Fangyuan Cheng
6d782e0fe4
Merge pull request #6902 from pureshine/cert-link 
Download the certificate link by default on ui
 2019-02-13 21:24:12 +08:00
Daniel Jiang
81639e2110
Merge pull request #6865 from wy65701436/remove-token 
Remove the token attribute from robot table
 2019-02-13 19:23:06 +08:00
Fangyuan Cheng
04c76d7f09 Modify the ui name and token that cannot be displayed due to backend api changes (#6914) 
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
 2019-02-13 18:57:49 +08:00
Yuan Lei
bd84f5f490 sperate the logics to two part: 1,tasks generating. 2,tasks submit 
Signed-off-by: Yuan Lei <371304458@qq.com>
 2019-02-13 17:47:07 +08:00
FangyuanCheng
54f74ff91d Download the certificate link by default on ui 
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
 2019-02-13 15:16:45 +08:00
Yan
e9556a4cec
Add post response for robot account API (#6906) 
This commit is to do:
1, Add post response on creating robot account
2, Lower-case the attribute of response

Signed-off-by: wang yan <wangyan@vmware.com>
 2019-02-13 14:40:04 +08:00
SDBrett
90529832a2 Additional unit tests for base.go (#6888) 
Increased coverage for http functions in base.go.

Signed-off-by: Brett Johnson <brett@sdbrett.com>
 2019-02-12 16:06:20 +08:00
Yuan Lei
956a4c4f05 scheduler module to schedule the transfer job of resouce 
Signed-off-by: Yuan Lei <371304458@qq.com>
 2019-02-11 16:49:25 +08:00
jwangyangls
a95586034e
Merge pull request #6885 from jwangyangls/privilege_escalation 
PermissionMasterRoleWithIsue
 2019-02-01 21:17:48 +08:00
He Weiwei
f7218f80e0
Merge pull request #6852 from heww/protect-api-using-rbac 
Protect API using rbac
 2019-02-01 21:11:26 +08:00
Yogi_Wang
1b80e79ec4 fixPermissionIssue 
Signed-off-by: Yogi_Wang <wang1084@126.com>
 2019-02-01 20:48:38 +08:00
He Weiwei
1c4b9aa346 Protect API using rbac 
Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2019-02-01 18:55:06 +08:00
System Administrator
1a551690d3 promission reset 
Signed-off-by: Yogi_Wang <wang1084@126.com>
 2019-01-31 18:06:49 +08:00
wang yan
5d6a28d73e Remove the token attribute for robot table 
This commit is to remove the token attribute as harbor doesn't store the token in DB.

Signed-off-by: wang yan <wangyan@vmware.com>
 2019-01-30 23:56:23 +08:00
FangyuanCheng
dacc0bd6bc Fixed display problems caused by formatting 
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
 2019-01-30 10:29:49 +08:00
Fangyuan Cheng
829bfe031e
Merge pull request #6823 from pureshine/robot-account 
Support Robot account in Harbor
 2019-01-29 18:36:26 +08:00
wang yan
f4f4535304 Fix action and resouce of RBAC change 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-01-29 17:05:15 +08:00
Daniel Jiang
bf663df0e7
Merge pull request #6820 from wy65701436/robot-service 
Add robot account authn & authz implementation
 2019-01-29 16:08:25 +08:00
FangyuanCheng
404ee307f3 Support Robot account in Harbor 
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
 2019-01-29 15:49:15 +08:00
Wenkai Yin
759cb5467b Refine the replication job 
1. Refine the replication job
2. Define the Transfer interface
3. Define the common models

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-01-29 15:48:02 +08:00
Wenkai Yin
daf81e2413
Merge pull request #6841 from heww/standard-rbac-actions 
Standard actions for rbac
 2019-01-29 13:49:41 +08:00
He Weiwei
6e95b98108 Standard actions for rbac 
Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2019-01-29 11:59:11 +08:00
Mia ZHOU
f202e5f738
Merge pull request #6827 from pureshine/tag-col 
The tag column sets the Maximum  width
 2019-01-29 11:09:56 +08:00
He Weiwei
1da0a66fe5
Merge pull request #6781 from heww/user-permissions-api 
Implement api for get current user permissions
 2019-01-29 01:58:51 +08:00
He Weiwei
0ab7c93e16 Replace casbin builtin keyMatch2 with custom match func 
Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2019-01-29 01:26:38 +08:00
wang yan
2d7ea9c383 update codes per review comments 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-01-28 21:26:06 +08:00
He Weiwei
8b5e68073d Implement api for get current user permissions 
Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2019-01-28 18:06:52 +08:00
Yan
71f37fb820 * Add robot account authn & authz implementation. 
This commit is to add the jwt token service, and do the authn & authz for robot account.

Signed-off-by: wang yan <wangyan@vmware.com>
 2019-01-28 17:39:57 +08:00
Daniel Jiang
20db0e737b Provide HTTP authenticator 
An HTTP authenticator verifies the credentials by sending a POST request
to an HTTP endpoint.  After successful authentication he will be
onboarded to Harbor's local DB and assigned a role in a project.

This commit provides the initial implementation.
Currently one limitation is that we don't have clear definition about
how we would "search" a user via this HTTP authenticator, a flag for
"alway onboard" is provided to skip the search, otherwise, a user has
to login first before he can be assigned a role in Harbor.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2019-01-28 15:43:44 +08:00
FangyuanCheng
fe5820efee The tag column sets the minimum width 
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
 2019-01-27 23:47:41 +08:00
Yogi_Wang
ebda1cda22 style_change 
Signed-off-by: Yogi_Wang <wang1084@126.com>
 2019-01-25 13:36:48 +08:00
He Weiwei
3f8e06a8bc Support master role for project member create and update apis (#6780) 
* Support master role for project member create and update apis

Signed-off-by: He Weiwei <hweiwei@vmware.com>

* Fix description for role_id in swagger.yaml

Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2019-01-23 14:56:23 +08:00
He Weiwei
ae061482ae Add Can method to securty.Context interface (#6779) 
* Add Can method to securty.Context interface

Signed-off-by: He Weiwei <hweiwei@vmware.com>

* Improve mockSecurityContext Can method

Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2019-01-23 14:32:37 +08:00