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

2291 Commits

Author SHA1 Message Date
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
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
wang yan
903e15235e Update validation and error message per comments 2019-01-17 15:33:05 +08:00
wang yan
4cde11892a update the conflict check with DB unique constrain error message 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-01-17 13:13:55 +08:00
Yan
1af0f3c3b9 Add API implementation of robot account 
Add API implementation of robot account

1. POST /api/project/pid/robots
2, GET /api/project/pid/robots/id?
3, PUT /api/project/pid/robots/id
4, DELETE /api/project/pid/robots/id

Signed-off-by: wang yan <wangyan@vmware.com>
 2019-01-17 13:13:55 +08:00
He Weiwei
8dab10bbed
Merge pull request #6765 from heww/rename-ram 
Rename ram to rbac
 2019-01-17 11:50:14 +08:00
He Weiwei
bacfe64979 Rename ram to rbac 
Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2019-01-16 18:20:30 +08:00
Wenkai Yin
f8d9653419
Merge pull request #6737 from ywk253100/190109_health_check 
Implement the unified health check API
 2019-01-16 18:14:14 +08:00
He Weiwei
76bee7a9fc
Merge pull request #6710 from heww/security-by-ram 
Implement current security interfaces using ram
 2019-01-16 17:47:13 +08:00
Wenkai Yin
be4455ec1b Implement the unified health check API 
The commit implements an unified health check API for all Harbor services

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-01-16 17:21:04 +08:00
He Weiwei
ebd26c0105 Implement current security interfaces using ram 
Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2019-01-16 16:08:17 +08:00
Steven Zou
464bdf71cd
Merge pull request #6727 from wy65701436/robot-dao 
Add dao of robot account
 2019-01-14 19:34:23 +08:00
wang yan
d349c256e8 add support for query nil 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-01-11 16:19:42 +08:00
Daniel Jiang
a1d4bfd332
Merge pull request #6344 from reasonerjt/bump-up-golang 
Bump up golang to 1.11.2
 2019-01-11 16:15:59 +08:00
Daniel Jiang
5d59d6fab8 Bump up golang to 1.11.2 
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2019-01-11 14:44:32 +08:00
wang yan
6bd6fbd4ad Add fuzzy match and delete funt per review comments 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-01-11 14:26:49 +08:00
System Administrator
27c180bf20 fix_bug 
Signed-off-by: Yogi_Wang <wang1084@126.com>
 2019-01-11 11:00:46 +08:00
wang yan
c6ae1388ec Add dao of robot account 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-01-10 14:51:33 +08:00
Daniel Jiang
80af81154c
Merge pull request #6702 from wy65701436/robot-db-scheme 
Add DB table for robot account
 2019-01-10 14:25:58 +08:00
wang yan
db09f9f101 Update token length and upper case the sql key words 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-01-09 10:00:54 +08:00
wang yan
362a0638d0 Add DB table for robot account 
This commit is to add DB scheme for robot account and update the db orm releated.

Signed-off-by: wang yan <wangyan@vmware.com>
 2019-01-08 18:46:16 +08:00
Daniel Jiang
b5788f0695
Merge pull request #6671 from heww/ram 
Add ram pkg
 2019-01-08 15:39:36 +08:00
Mia ZHOU
45685b49d6
Merge pull request #6708 from zhoumeina/cherry_pick_disable_retag 
disable retag function if with admiral
 2019-01-08 15:04:10 +08:00
Meina Zhou
b7153798b5 disable retag function if with admiral 
Signed-off-by: Meina Zhou <meinaz@vmware.com>
 2019-01-08 13:49:54 +08:00
Yogi_Wang
10d74eabd7 upgrade clarity components to 1.0 and fix issue 
Signed-off-by: Yogi_Wang <Yogiwang@Yogi-WangdeMacBook-Pro.local>
 2019-01-08 12:50:26 +08:00
Wenkai Yin
f9c1a528cb
Merge pull request #6689 from jkroepke/patch-1 
Remove user agent check for docker notifications
 2019-01-04 18:23:09 +08:00
He Weiwei
79f786ecbe Add ram pkg 
Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2019-01-04 13:17:13 +08:00
Fangyuan Cheng
5967537daa
Merge pull request #6609 from pureshine/devcenter-btn 
Modify the location to open the Developer Center
 2019-01-04 11:24:02 +08:00
Jan-Otto Kröpke
8b65e4f424
Remove user agent check for docker notifications 
Fixes #5729

Signed-off-by: Jan-Otto Kröpke <mail@jkroepke.de>
 2019-01-03 21:17:29 +01:00
Wenkai Yin
75d45ebd9d
Merge pull request #6547 from cd1989/retag-input-validation 
Validate repo and tag names in retag
 2019-01-03 17:45:44 +08:00
FangyuanCheng
7a22f895ab Modify the location to open the Developer Center 
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
 2019-01-03 14:57:26 +08:00
Yogi_Wang
aee07fff96 upgrade clarity components to 1.0 
Signed-off-by: Yogi_Wang <Yogiwang@Yogi-WangdeMacBook-Pro.local>
 2019-01-03 10:32:52 +08:00
Mia ZHOU
4f291e34eb
Merge pull request #6630 from pureshine/refactor-config 
Config component nav tabs to use clarity component
 2018-12-26 12:18:54 +08:00
Fangyuan Cheng
1456d1d326
Merge pull request #6628 from zhoumeina/add_swagger_title 
add harbor swagger title for api explorer
 2018-12-26 10:37:57 +08:00
Meina Zhou
92539a4bec add harbor swagger title for api explorer 
Signed-off-by: Meina Zhou <meinaz@vmware.com>
 2018-12-26 09:41:54 +08:00
FangyuanCheng
4ad66b6d9b Config component nav tabs to use clarity component 
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
 2018-12-25 18:36:18 +08:00
FangyuanCheng
a4e17ec183 When harbor is deployed in http mode, the registry certificate download button is not displayed in the project page. 
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
 2018-12-25 14:31:29 +08:00
cd1989
c117a23133 Validate repo and tag names in retag 
Signed-off-by: cd1989 <chende@caicloud.io>
 2018-12-24 16:49:39 +08:00
FangyuanCheng
256289810d Fix download certificate link bug 
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
 2018-12-24 00:06:04 +08:00
Daniel Jiang
93c0a18b06
Merge pull request #6537 from stonezdj/ref_admin_driver 
Refactor config settings stage2
 2018-12-21 15:12:56 +08:00
stonezdj
2446878f6b Refactor config settings stage2 
Signed-off-by: stonezdj <stonezdj@gmail.com>
 2018-12-21 10:59:11 +08:00
He Weiwei
f403e50234
Merge pull request #6577 from heww/master 
Include os version in image tag detail page
 2018-12-20 18:18:44 +08:00
Qian Deng
c4ecd4e0f6 Fix i18n switch issue (#6579) 
This issue is caused by error formated json file

Signed-off-by: Qian Deng <dengq@vmware.com>
 2018-12-20 15:52:59 +08:00
He Weiwei
e7f09643bd Include os version in image tag detail page 
Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2018-12-20 15:12:19 +08:00
Qian Deng
1430a24b55 Update i18n files of project_detail 
Add `helmchart` item in `project_detail` entry

Signed-off-by: Qian Deng <dengq@vmware.com>
 2018-12-20 10:09:26 +08:00
Meina Zhou
66c1beb467 fix retag project list can not select 
Signed-off-by: Meina Zhou <meinaz@vmware.com>
 2018-12-19 14:39:49 +08:00
Mia ZHOU
ac47500eb6
Merge pull request #6552 from pureshine/inline-css 
Move inline css style to scss
 2018-12-19 13:40:16 +08:00
Mia ZHOU
2062c436d3
Merge pull request #6553 from zhoumeina/fix_retag_ui 
show retag tooltip use regex, reset the dialog form when retagged
 2018-12-19 13:32:07 +08:00
Meina Zhou
a3e357bb7f show retag tooltip use regex, reset the dialog form when retagged 
Signed-off-by: Meina Zhou <meinaz@vmware.com>
 2018-12-19 13:07:46 +08:00
Fangyuan Cheng
bb15f67316
Merge branch 'master' into inline-css 2018-12-19 10:07:21 +08:00
FangyuanCheng
c36e9daea1 Move inline css style to scss 
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
 2018-12-18 21:19:08 +08:00
Wenkai Yin
b28bca7af4
Merge pull request #6541 from salkin/proxy-transport 
Add support for http proxy in transport
 2018-12-18 15:46:29 +08:00
Niklas Wik
138bc69f0f Add support for http proxy in transport 
Signed-off-by: Niklas Wik <niklas.wik@nokia.com>
 2018-12-17 10:35:27 +02:00
Mia ZHOU
da0f1d2831
Merge pull request #6525 from zhoumeina/dev-center1 
add developer center in swagger ui way
 2018-12-13 16:27:55 +08:00
Meina Zhou
d45ccbbb29 add developer center in swagger ui way 
Signed-off-by: Meina Zhou <meinaz@vmware.com>
 2018-12-13 15:17:38 +08:00
SDBrett
0e260d180c Added tests for failure conditions (#6501) 
Added unit tests for registryctl auth to cover failure conditions to increase test coverage.
New tests cover no secret specified and incorrect harbor secret prefix

Signed-off-by: Brett Johnson <brett@sdbrett.com>
 2018-12-13 11:35:17 +08:00
stonezdj(Daojun Zhang)
13511d74ed Refactor config settings encrypt + metadata (#6387) 
Signed-off-by: stonezdj <stonezdj@gmail.com>
 2018-12-12 12:14:33 +08:00
Wenkai Yin
f7a28ee2a2 Remove the duplicate http error struct (#6516) 
There are two different types to represent http error in the current code. This commit updates the codes to keep only one.

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2018-12-12 11:51:19 +08:00
Wenkai Yin
5388eb4db6 Read ssl mode param from the adminserver to init the connection with database (#6504) 
This commit adds the ssl mode as a param when establishing the connection with database

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2018-12-11 13:58:37 +08:00
Fangyuan Cheng
7f4dac2101
Merge pull request #6497 from pureshine/error-message 
Modify the error message when deleting a signed images in harbor-helm
 2018-12-11 11:29:47 +08:00
Mia ZHOU
e9a34224e4
Merge pull request #6499 from cd1989/retag-button-for-guest 
Enable retag button to project guest
 2018-12-11 10:55:50 +08:00
Mia ZHOU
53858fe2f1
Merge pull request #6482 from pureshine/default-version 
Return unknow when about dialog cannot get harbor version
 2018-12-11 10:30:40 +08:00
Mia ZHOU
4fc0716005
Merge pull request #6500 from pureshine/svg-format 
Change the image in png format to the image in svg format
 2018-12-11 10:24:04 +08:00
cd1989
fdddb37545 Enable retag button to project guest 
Signed-off-by: cd1989 <chende@caicloud.io>
 2018-12-10 15:46:48 +08:00
FangyuanCheng
892a76c27e Modify the error message when deleting a signed images in harbor-helm 
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
 2018-12-10 14:39:04 +08:00
FangyuanCheng
cce22d569d Return unknow when about dialog cannot get harbor version 
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
 2018-12-10 13:20:20 +08:00
FangyuanCheng
13686cbe83 Change the image in png format to the image in svg format 
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
 2018-12-07 13:54:13 +08:00
Meina Zhou
073cacd9b3 fix helm chart did not get global label 
The root cause is helm chart does not get glboal labels

Signed-off-by: Meina Zhou <meinaz@vmware.com>
 2018-12-07 12:33:25 +08:00
Mia ZHOU
f2a9e8ae9b
Merge pull request #6472 from pureshine/filter-tag 
Remove the default label when filtering images by label
 2018-12-07 08:24:43 +08:00
Wenkai Yin
bcd6947fcc
Merge pull request #6470 from cd1989/retag-problem 
Give meaningful error messages when retag is forbidden
 2018-12-06 18:47:58 +08:00
De Chen
60d65a9d86 Block retag requests in read-only mode (#6457) 
Signed-off-by: cd1989 <chende@caicloud.io>
 2018-12-06 18:35:22 +08:00
cd1989
caf07a96fe Give meaningful messages when retag forbided 
Signed-off-by: cd1989 <chende@caicloud.io>
 2018-12-06 16:25:21 +08:00
FangyuanCheng
158fb92745 Remove the border of default label when filtering images by label 
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
 2018-12-06 15:35:42 +08:00
Mia ZHOU
657ee8a150
Merge pull request #6469 from zhoumeina/fix_scan_log_viewer 
fix #6432 modify scan log to use popup window
 2018-12-06 15:11:03 +08:00
Meina Zhou
791646b8b0 fix #6432 modify scan log to use popup window 
Signed-off-by: Meina Zhou <meinaz@vmware.com>
 2018-12-06 14:24:24 +08:00
Mia ZHOU
9100dfdb5f
Merge pull request #6468 from zhoumeina/fix_500_gc 
#6440 fix gc will have 500 error when user try to put a new schedule
 2018-12-06 14:22:43 +08:00
Wenkai Yin
746d58ceb4 Return the error message when changing password with wrong old password (#6466) 
Return a meaningful error message when changing password but the a wrong old password is provided to render on UI

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2018-12-06 13:29:30 +08:00
Mia ZHOU
eeb6d4a9b9
Merge pull request #6456 from pureshine/add-user 
Modify the error message when adding members
 2018-12-06 12:53:44 +08:00
Mia ZHOU
2614306768
Merge pull request #6427 from pureshine/remove-am 
Time display using 24-hour system
 2018-12-06 12:52:52 +08:00
Mia ZHOU
a16c7b07a9
Merge pull request #6424 from pureshine/scan-now 
Don't get the next available time while scan now
 2018-12-06 12:44:56 +08:00
Meina Zhou
5db765ea10 #6440 fix gc will have 500 error when user try to put a new schedule 
Signed-off-by: Meina Zhou <meinaz@vmware.com>
 2018-12-06 12:43:24 +08:00
Daniel Jiang
29d5b5da72 Return 409 when there is a scan all job running (#6460) 
* Return 409 when user trigger another "scan all"

This commit fixes #6418, that when multiple "scan all" jobs are
triggered, the API should not return 500.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>

* Update swagger to add 409 to scanAll API

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2018-12-06 11:46:38 +08:00
FangyuanCheng
b866344310 Modify the error message when adding members 
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
 2018-12-05 19:37:01 +08:00
FangyuanCheng
f09002a26c Time display using 24-hour system 
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
 2018-12-05 18:26:23 +08:00
Meina Zhou
87cf6527c7 fix #6421 javascript error when user input nothing in the filter logs 
Signed-off-by: Meina Zhou <meinaz@vmware.com>
 2018-12-05 18:16:24 +08:00
Wenkai Yin
538082ceb6 Remove the permission checking for getcert API (#6436) 
The Harbor root cert can be downloaded by all users now, so the permission checking is not needed anymore

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2018-12-05 12:15:23 +08:00
FangyuanCheng
2e0fcab6ee Don't get the next available time while scan now 
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
 2018-12-04 16:44:31 +08:00
peimingming
585d7b2b01 Add unit test for JobService Logger 
Signed-off-by: peimingming <peimingming@corp.netease.com>
 2018-12-03 16:20:03 +08:00
Daniel Jiang
ae240df031 Remove the Scan all in-memory marker (#6399) 
Previously there was a in-memory marker to prevent user from frequently
calling the "scan all" API.  This has become problematic in HA
deployment, and is no longer needed after enhancement in jobservice.

This commit removes the marker for "scan all" api, however, we need to
review the mechanism and rework to make it stateless.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2018-12-02 15:40:50 +08:00
Steven Zou
9c76c375ac
Merge pull request #6396 from steven-zou/unique_job 
Support unique job constraints (both unique queue and running jobs)
 2018-11-30 17:03:43 +08:00
Qian Deng
1de52e28ae
Merge pull request #6398 from ninjadq/fix_i18n_of_delete_project_failure_msg 
Fix: i18n issues of deleting project failure info
 2018-11-30 16:44:11 +08:00
Mia ZHOU
a90fb5219c
Merge pull request #6394 from ninjadq/fix_robot_cases_for_global_search 
Fix xpath in go to project robot case
 2018-11-30 16:43:55 +08:00
Mia ZHOU
42fe0ec30a
Merge pull request #6397 from ninjadq/fix_helm_chart_api_in_ui 
Fix: helmchart api change caused problems
 2018-11-30 16:43:19 +08:00
Wenkai Yin
a81346a4ba
Merge pull request #6386 from heww/session 
change session cookie name to sid
 2018-11-30 16:13:45 +08:00
Steven Zou
84d864607c Add UT cases for new added code 
Signed-off-by: Steven Zou <szou@vmware.com>
 2018-11-30 16:08:15 +08:00
Qian Deng
9020cd6cd2 Fix: i18n issues of deleting project failure info 
Fix i18n issues that may confuse people

Signed-off-by: Qian Deng <dengq@vmware.com>
 2018-11-30 15:40:26 +08:00
Qian Deng
9dd509e0eb Fix xpath in go to project robot case 
Global search bug fix introduced test case failure, fix it by edit xpath

Signed-off-by: Qian Deng <dengq@vmware.com>
 2018-11-30 15:33:14 +08:00
Qian Deng
2a583fccfe Fix: helmchart api change caused problems 
Adapter ui to new backend API

Signed-off-by: Qian Deng <dengq@vmware.com>
 2018-11-30 15:28:28 +08:00
Steven Zou
ec2ad4d0b8
Merge pull request #6093 from cd1989/replication-record-id 
Add op uuid to image replication
 2018-11-30 14:54:43 +08:00
Mia ZHOU
b3d0d64ebd
Merge pull request #6392 from pureshine/nav-logo 
Add harbor logo to navigation bar
 2018-11-30 14:42:55 +08:00
Steven Zou
ccd486a0ad Support unique job constraints (both unique queue and running jobs) 
Signed-off-by: Steven Zou <szou@vmware.com>
 2018-11-30 14:14:21 +08:00
Wenkai Yin
9d5cf57373 Check the existence of name when creating replication rule and fix bugs in testing library (#6381) 
1. Fix #5102 by checking the existence of name when creating/editing replication rule
2. Add unique constraint to the name of replication policy and target
3. Fix bugs of testing library

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2018-11-30 13:32:20 +08:00
FangyuanCheng
566fc5de02 Add harbor logo to navigation bar 
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
 2018-11-29 23:18:26 +08:00
stonezdj
3b165d41d4 Fix LDAP search error 
Signed-off-by: stonezdj <stonezdj@gmail.com>
 2018-11-29 18:37:23 +08:00
Steven Zou
68b1b98f0a
Merge pull request #6375 from steven-zou/fix_global_search_502_issue 
Fix global search 502 issue happened when chart repo is not enabled
 2018-11-29 16:29:08 +08:00
Daniel Jiang
a3f424f5f3
Merge pull request #6378 from cd1989/retag-status-code-fix 
Fix status code for permission check in retag, use 403
 2018-11-29 16:00:34 +08:00
Steven Zou
d82482499b
Merge pull request #6371 from mmpei/6144-JSLoggerInDB 
6144 js logger in db
 2018-11-29 15:58:20 +08:00
Steven Zou
e7ffaecca5 Fix global search 502 issue happened when chart repo is not enabled 
Signed-off-by: Steven Zou <szou@vmware.com>
 2018-11-29 15:53:09 +08:00
He Weiwei
00a3948fff change session cookie name to sid 
Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2018-11-29 15:18:15 +08:00
Wenkai Yin
3ff4402a35
Merge pull request #6379 from steven-zou/add_retry_to_connect_redis 
Add retry with backoff when creating redis cache for chart server
 2018-11-29 13:52:43 +08:00
Mia ZHOU
3c000f10a0
Merge pull request #6338 from ninjadq/fix_chart_ui_related_issues 
Fix chart ui related issues
 2018-11-29 10:11:44 +08:00
Steven Zou
5ccfa9f8ad Add retry with backoff when creating redis cache for chart server 
Signed-off-by: Steven Zou <szou@vmware.com>
 2018-11-28 22:23:03 +08:00
陈德
f72c7766ae Fix status code for permission check in retag, use 403 
Signed-off-by: 陈德 <chende@caicloud.io>
 2018-11-28 19:48:25 +08:00
peimingming
238dbc0347 Add UT and review comments and issue fix (#6144) 
Signed-off-by: peimingming <peimingming@corp.netease.com>
 2018-11-28 17:43:14 +08:00
Steven Zou
b895fda13a Fix the malformat json data of chart list API 
Signed-off-by: Steven Zou <szou@vmware.com>
 2018-11-28 17:07:17 +08:00
peimingming
c67fdc40f5 Support store job log in DB (#6144) 
Signed-off-by: peimingming <peimingming@corp.netease.com>
 2018-11-28 15:09:29 +08:00
Qian Deng
59b47ba29b Enhance: the header of add label component will passed by parant 
Make the header word of label to be a input argument.

Signed-off-by: Qian Deng <dengq@vmware.com>
 2018-11-27 14:45:08 +08:00
Mia ZHOU
f78660ff84
Merge pull request #6356 from pureshine/fix-iconbug 
Fix the bug that markdown icon does not display on the page
 2018-11-27 11:27:29 +08:00
FangyuanCheng
f39cd17003 Fix the bug that markdown icon does not display on the page 
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
 2018-11-27 10:16:14 +08:00
Daniel Jiang
ca79a98f17 Add dependencies to Gopkg.toml (#6343) 
During the legal process for 1.7.0 I found some dependencies are not tracked in
Gopkg.toml.
This commit explicitly add depedencies on these packages.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2018-11-27 09:27:12 +08:00
Qian Deng
d484025fa1 Fix: helm chart results style 
1. Do not show chart results if chart is not enabled
2. Fix style in scroll of results page

Signed-off-by: Qian Deng <dengq@vmware.com>
 2018-11-23 17:38:51 +08:00
Qian Deng
259b984755 Fix: change label style in helm chart summary page 
1. Add label style
2. Fix style

Signed-off-by: Qian Deng <dengq@vmware.com>
 2018-11-23 16:36:03 +08:00
Qian Deng
213dd39b5b Fix: strange string in cmd input in the chart summary 
Should using backquotes instead of doublequotes to string that need interpreted.

Signed-off-by: Qian Deng <dengq@vmware.com>
 2018-11-23 16:28:51 +08:00
Qian Deng
31f45ae908 Fix: i18n issue in add label filter header in chart version 
In chart version view, wrong description appeared in add label button's header

Signed-off-by: Qian Deng <dengq@vmware.com>
 2018-11-23 16:07:04 +08:00
Qian Deng
405565b744 Enhance: Add helm chart count number in the project list 
Project API return the helm chart count now, so put it to UI.

Signed-off-by: Qian Deng <dengq@vmware.com>
 2018-11-12 15:47:51 +08:00