Commit Graph

6818 Commits

Author SHA1 Message Date
Yan
5412e581de
Add a flag judging on building migrator (#6905)
This commit is to add a flag judging when to build image of migator, which is not necessary.

Signed-off-by: wang yan <wangyan@vmware.com>
2019-02-12 20:33:42 +08:00
Wenkai Yin
9c8c96ad4f
Merge pull request #6721 from SDBrett/clair-import-doc
Updated clair db import for Harbor 1.6+
2019-02-12 19:54:55 +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
yeya24
628b94db19 fix some typos
Signed-off-by: yeya24 <ben.ye@daocloud.io>
2019-02-05 12:03:52 +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
jwangyangls
3d726219e5
Merge pull request #6758 from jwangyangls/privilege_escalation
user permission change and add master role
2019-01-31 18:57:22 +08:00
System Administrator
1a551690d3 promission reset
Signed-off-by: Yogi_Wang <wang1084@126.com>
2019-01-31 18:06:49 +08:00
danfengliu
47530cd62e
remove some sleep and add retry common keyword (#6875)
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-01-31 17:58:05 +08:00
danfengliu
e5efbfe490
add retry keyword for docker pull and push image command. (#6857)
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-01-31 16:08:58 +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
Wenkai Yin
0115067277
Merge pull request #6782 from ywk253100/190117_replication_define
Refine the replication job
2019-01-30 15:12:14 +08:00
danfengliu
e12fd13c56
Encapsulate keyword <element click> and add it into keyword <Go Back To Versions And Delete>, this porblem caused case failure of <List Helm Charts> randomly. (#6834)
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-01-30 14:22:31 +08:00
Yan
a77684bf1d
add API doc of robot account (#6846)
Signed-off-by: wang yan <wangyan@vmware.com>
2019-01-30 14:10:26 +08:00
Qian Deng
e6cdbeb639
Merge pull request #6854 from pureshine/fix-bug
Fixed display problems caused by formatting
2019-01-30 11:27:05 +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
He Weiwei
4af9a42ea8
Merge pull request #6847 from wy65701436/update-res-robot
Fix action and resouce of RBAC change
2019-01-29 17:42:00 +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
Brett Johnson
4c9b98a463 Updated clair db import for Harbor 1.6+
Signed-off-by: Brett Johnson <brett@sdbrett.com>
2019-01-29 09:14:23 +11: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
Wenkai Yin
dffe824c84
Merge pull request #6771 from reasonerjt/authproxy-authn
Provide HTTP authenticator
2019-01-28 17:44:15 +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
danfengliu
9aeb626fe3
The former way to verify project creation is by API calling, but it's not a GUI operation, which is not a goal for operator, so I replace it with GUI verification (#6816)
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-01-28 16:32:45 +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
Qian Deng
6888c3247c
Merge pull request #6819 from jwangyangls/harbor_style_change
style_change
2019-01-26 21:18:08 +08:00
Yogi_Wang
ebda1cda22 style_change
Signed-off-by: Yogi_Wang <wang1084@126.com>
2019-01-25 13:36:48 +08:00
danfengliu
923432a172
resort test case, 2 test cases failed due to unfinish chart data preparation, so resort the test cases, move the verification test case ahead of the 2 failed cases. (#6818)
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-01-25 10:26:14 +08:00
danfengliu
b0c1adab8d
add retry for make swagger client (#6813)
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-01-24 17:09:32 +08:00
danfengliu
257eebfebe
Add space adaptor for regexp when create a new project, we loose the criteria to match the project name because the return json datat may be shown in different lines . (#6768)
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-01-24 09:38:46 +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
Dan Norris
fa4280887d
Fix Swagger client generation for a few chartrepo endpoints
It looks like the Swagger for `ChartVersions` and `ChartVersionDetails`
were missing fields to properly generate a client.

This fixes the problem by adding the correct `refs` so that the client
produces an output when making an API call.

In Go, this generates something like:

```Go
/*GetChartrepoRepoChartsNameVersionOK handles this case with default header values.

Successfully retrieved the chart version
*/
type GetChartrepoRepoChartsNameVersionOK struct {
	Payload *models.ChartVersionDetails
}

...

/*GetChartrepoRepoChartsNameOK handles this case with default header values.

Retrieved all versions of the specified chart
*/
type GetChartrepoRepoChartsNameOK struct {
	Payload models.ChartVersions
}
```

Signed-off-by: Dan Norris <dan.norris@netapp.com>
2019-01-22 08:59:06 -08:00
Wenkai Yin
5abfa2de3a
Merge pull request #6759 from danfengliu/debug-go-into-project-in-harbor-nightly-migrate-offline
Keyword <Go Into Project> has modified, but verify.robot didn't adapt…
2019-01-18 16:28:42 +08:00
Mia ZHOU
1ca9fb59b5
Merge pull request #6770 from ninjadq/fix_issue_global_search_cannot_reload_data
Fix: data not reload when global serach navigate to same location
2019-01-18 14:30:36 +08:00
Qian Deng
276202cfa9 Fix issue data not reload when global serach going to a location that has the same url
Just add a reload option on router module. This feature is introduced in angular5, we can solve this issue easily.

Signed-off-by: Qian Deng <dengq@vmware.com>
2019-01-18 13:34:32 +08:00
danfengliu
f29960628a Keyword <Go Into Project> has modified, but verify.robot didn't adapt this keyword.
Modifications:
	1.Add paramenter hasimage in data.json
	2.Modify Harbor-Pages\Verify.robot to pass it to <Go Into Project>
	3.Add loop and exception-catch in <Go Into Project> to prevent using Sleep and failure by exception(this exception was caused by short time of paga loading)

Signed-off-by: danfengliu <danfengl@vmware.com>
2019-01-17 17:46:17 +08:00