Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-27 12:46:03 +01:00
Code Issues Projects Releases Wiki Activity
4,185 Commits 53 Branches 317 Tags 334 MiB
30a64b1923
Commit Graph

1233 Commits

Author SHA1 Message Date
Fuhui Peng (c)
bdd0664134 Merge master and modify package version 2018-01-03 17:52:22 +08:00
Daniel Jiang
1a7f6f36e2
Merge pull request #3903 from reasonerjt/uaa-ca-config 
Enable configuring the CA Certificate for UAA
 2018-01-03 17:28:39 +08:00
Tan Jiang
e02de2068a Enable configuring the CA Certificate for UAA 
Enable configuring the path of root cert of UAA in harbor.cfg.  It only
takes effects if the verify_cert is set to "true" If the file does not
exist, the configuration is skipped.
The intention for this commit is to support integration with nested UAA
in PAS or PKS, we don't expect user to manually configure this value,
though he can do it if he wants.
 2018-01-03 16:21:29 +08:00
Deng, Qian
a89678466e Enhancement of Metadata Descrition 2018-01-03 16:12:17 +08:00
Fuhui Peng (c)
31c3063783 Merge remote-tracking branch 'upstream/replication_enhancement' into repEnhance 2018-01-03 13:41:31 +08:00
Wenkai Yin
96a63c56b1 Merge remote-tracking branch 'upstream/master' into 180103_merge 2018-01-03 10:32:03 +08:00
pengpengshui
c5e434bd14
Merge pull request #3859 from pengpengshui/batch-delection 
Add batch-delete operation in project module, replication module and user module
 2018-01-03 10:27:55 +08:00
Fuhui Peng (c)
d7c0bc5168 Add batch delection operation in project module, replication module and user module 
Modify privilege about project module

Modify package version about harbor-ui

Fix case failed in new batch delection UI
 2018-01-02 19:42:44 +08:00
Daniel Jiang
5289ff8d5a
Merge pull request #3888 from stonezdj/ldap_security2 
Do not display internal error message to user
 2017-12-29 16:49:53 +08:00
Deng, Qian
ef045bb720 Add UI Component for UAA Auth 2017-12-29 12:02:13 +08:00
Tan Jiang
cae581979b Return UAA settings in configuration API 
All the UAA settings will be read only as we expect user to modify it
via opsman instead of Harbor UI.
 2017-12-28 11:30:18 +08:00
stonezdj
fba68ed000 Do not display internal error message to user 2017-12-27 19:22:17 +08:00
Wenkai Yin
4616153667
Merge pull request #3885 from ywk253100/171227_fix_update 
Update project ID property if needed when updating replication policy
 2017-12-27 15:45:53 +08:00
Wenkai Yin
a9d7403bee Update project ID property if needed when updating replication policy 2017-12-27 15:04:26 +08:00
Wenkai Yin
d36811ce52 Using the string trimmed the project name at the begining as the input of repository filter 2017-12-26 19:31:53 +08:00
stonezdj
35716dedd3 Sync user email in ldap #3663 2017-12-26 18:53:32 +08:00
stonezdj
9f99d0400c Call EscapeFilter for filter to avoid security issue 2017-12-26 15:34:14 +08:00
Fuhui Peng (c)
fb83f2433f Modify replication list datagrid 2017-12-26 14:54:59 +08:00
Fuhui Peng (c)
601c94d976 Merge remote-tracking branch 'upstream/replication_enhancement' into repEnhance 
Update ui code to the latest
 2017-12-26 14:06:55 +08:00
Daniel Jiang
94c78b3bee
Merge pull request #3858 from xuri/master 
Simple code and typo fixed.
 2017-12-26 12:06:27 +08:00
Daniel Jiang
8e53ca07c4
Merge pull request #3850 from reasonerjt/uaa-search 
Search UAA when adding member to a project.
 2017-12-26 09:51:50 +08:00
Tan Jiang
da20e4f11c Search UAA when adding member to a project. 
1)Enable UAA client to search UAA by calling '/Users' API.
2)Implement 'SearchUser' in UAA auth helper, register it to auth
package.
 2017-12-26 00:25:32 +08:00
Wenkai Yin
3be1d5a7fd Assign read-only privilege of replication policy to project admin and add stopping replication jobs API. 2017-12-25 23:49:21 +08:00
Fuhui Peng (c)
831f69595a Add ui code about replication enhancement 2017-12-25 17:02:21 +08:00
Qian Deng
36d4211aa7
Merge pull request #3806 from ninjadq/upgrade_clarity_to_0_10_x 
Upgrade Clarity to 0.10.x and Angular To 4.3.0
 2017-12-25 17:01:48 +08:00
Deng, Qian
3187dcb5ae Upgrade Clarity to 0.10.x and Angular To 4.3.0 2017-12-25 16:10:51 +08:00
pengpengshui
583ce589f1
Merge pull request #3815 from pengpengshui/uaa 
Add ui control in uaa_auth #3803
 2017-12-25 13:20:19 +08:00
Ri Xu
9adccd3723
Simple code and typo fixed. 
Signed-off-by: Ri Xu <xuri.me@gmail.com>
 2017-12-23 20:55:07 +08:00
yixingjia
7c510fa2c8
Merge pull request #3844 from yixingjia/addTest 
Add test case for Clair DB configuration
 2017-12-21 16:39:46 +08:00
Daniel Jiang
01ec0c7c17
Merge pull request #3841 from reasonerjt/dep-vendor 
Switch to dep to manage the dependencies of source code
 2017-12-21 13:20:39 +08:00
Tan Jiang
1bd7d5b719 Switch to golang/dep to manage the dependencies of source code 
Used golang/dep to regenerate the code in /vendor directory.
Also edited `CONTRIBUTING.md` to explain the process for dependency
management.
 2017-12-21 12:18:13 +08:00
yixingj
08a1b45b72 Add test case for Clair DB configuration 
Add test case for validate Clair DB config
 2017-12-21 11:39:53 +08:00
yixingjia
fa67e11680
Merge pull request #3831 from yixingjia/HA_Clair 
Make Clair DB configurable
 2017-12-21 11:31:26 +08:00
Daniel Jiang
60d2204f33
Merge pull request #3840 from ywk253100/171220_desc 
Allow project developer to edit repository description
 2017-12-21 02:17:58 +08:00
Tan Jiang
12cd733678 Remove useless code from UI router and API 
Some URLs are not used on UI, so they are removed.  And the validation
code of API is removed as we use the security context approach.

fix test issue
 2017-12-20 23:10:38 +08:00
yixingj
f63588855f Make Clair DB configurable 
Make the HOST,PORT,USERNAME,DB configurable for
Clair
 2017-12-20 18:29:50 +08:00
Daniel Jiang
052521b92c
Merge pull request #3821 from reasonerjt/uaa-restriction 
Refactor the configuraiton of UAA
 2017-12-19 19:36:09 +08:00
Daniel Jiang
c0c262cb53
Merge pull request #3790 from ywk253100/171214_author 
Read image author from label 'maintainer' if author is null
 2017-12-19 18:40:25 +08:00
Tan Jiang
2ffc58a5d4 Refactor the configuraiton of UAA 
Remove the attribute "uaa_ca_root" from harbor.cfg and introduce
"uaa_verify_cert".  Similar to LDAP settings, this allow user to
explicitly turn of the cert verification against UAA server, such that
the code will work with self-signed certificate.
 2017-12-19 14:42:07 +08:00
Daniel Jiang
62cebbdb5d
Merge pull request #3797 from reasonerjt/uaa-restriction 
Disable user management features when auth mode is UAA.
 2017-12-18 22:47:08 +08:00
Fuhui Peng (c)
fb794dac26 Add code about uaa_auth #3803 2017-12-18 18:52:18 +08:00
Daniel Jiang
cdadc94d0f
Merge pull request #3804 from ywk253100/171215_jobservice 
Print stack trace when recover from panic and print warning message rather than returning an error when updating 0 records
 2017-12-18 16:36:20 +08:00
Tan Jiang
224f75b9a6 Refactor /users API, add more restircation in password reset 
Simplified the code when checking if a user is modiable in different
auth modes.
Also add restriction in password, such that when the auth mode is not DB
auth, only the super user can choose to reset his password.
 2017-12-18 14:32:29 +08:00
Wenkai Yin
260ef561c4 Update the HTTP client for easy use by add more util functions 2017-12-16 06:45:59 +08:00
Wenkai Yin
42c9c439f9 Allow project developer to edit repository description 2017-12-15 20:30:39 +08:00
Daniel Jiang
7946b07fce
Merge pull request #3796 from stonezdj/ldap_3653 
Fix ldap ping issue #3653
 2017-12-15 16:12:36 +08:00
Qian Deng
40f766b29a
Merge pull request #3742 from ninjadq/metadata_description 
Add UI for metadata description
 2017-12-15 15:44:50 +08:00
stonezdj
9393d26fdc Fix ldap ping issue #3653 2017-12-15 14:47:54 +08:00
Wenkai Yin
d9b0f54c5e Split populating author as a method and add unit test 2017-12-15 10:40:24 +08:00
Wenkai Yin
a736cb7b09 Update the HTTP client according to the comments 2017-12-15 09:40:31 +08:00
Wenkai Yin
c4dc95f4f9 Add implement for supporting replicatie the existing images now 2017-12-15 09:40:31 +08:00
Wenkai Yin
b5e7de331e Delete enabled and start_time properties of replication rule 2017-12-15 09:40:31 +08:00
Wenkai Yin
055ab0ba15 Refine replication schedule trigger API 2017-12-15 09:40:31 +08:00
Wenkai Yin
1d2e206ce4 Refactor replication filter chain 2017-12-15 09:40:31 +08:00
Wenkai Yin
76c88d8d49 Fix bugs of replicaton 2017-12-15 09:40:31 +08:00
Wenkai Yin
fe10c2e7f5 Create replicator to submit replication job to jobservice 2017-12-15 09:40:31 +08:00
Wenkai Yin
8b4fdfc2cc Add unit tests for replication related methods 2017-12-15 09:40:31 +08:00
Wenkai Yin
c5ccb7e53c Enable filter chain in replication 2017-12-15 09:40:30 +08:00
Wenkai Yin
a384325a1e Publish replication notification for manual, scheduel and immediate trigger 2017-12-15 09:40:30 +08:00
Wenkai Yin
a54b7dd4c0 Merge remote-tracking branch 'upstream/master' into 171219_merge 2017-12-15 08:48:57 +08:00
Wenkai Yin
43489c2b67 Print stack trace when recover from panic and print warning message rather than returning an error when updating 0 records 2017-12-14 13:48:45 +08:00
Wenkai Yin
745d83e393 Read image author from label 'maintainer' if author is null 2017-12-13 23:28:01 +08:00
Tan Jiang
5da894bcf2 Small refactory. 2017-12-13 20:58:27 +08:00
stone
cbd1431333
Merge pull request #3726 from stonezdj/ldap_refactor2 
Refactor LDAP code

Changes include:
1. Use session to manage the lifecycle of LDAP connections
2. Abstract common AuthenticateHelper interface for db_auth, ldap_auth, uaa_auth
 2017-12-13 16:21:20 +08:00
Deng, Qian
a4bd27c7b0 Bump UI Lib version 2017-12-13 15:37:56 +08:00
Deng, Qian
ccfd206ae2 Merge branch 'master' into metadata_description 2017-12-13 15:21:57 +08:00
stonezdj
ec67974104 Refactor ldap 
Changes include:

1. Use Session to manage the lifecycle of ldap connections
2. Abstract common AuthenticateHelper interface for db_auth, ldap_auth,
uaa_auth mode
 2017-12-13 14:57:04 +08:00
Wenkai Yin
665a54edc3 Merge remote-tracking branch 'upstream/master' into 171213_merge 2017-12-13 13:40:24 +08:00
Fuhui Peng (c)
f179e09cd0 Fix Replication Rule Ping target issue about #3770 2017-12-12 18:05:03 +08:00
yixingjia
f4d0fd4d23
Merge pull request #3640 from yixingjia/moveconftoDB 
Add database driver for Harbor configurations
 2017-12-11 10:42:05 +08:00
Deng, Qian
b15acdf151 Add UI for metadata description 2017-12-08 15:05:52 +08:00
yixingj
9b03c93afd Add database driver for Harbor configurations 
1>Add a new database driver for configurations
2> change the current default driver from json
to database
 2017-12-06 13:06:54 +08:00
Qian Deng
5de872486c
Merge pull request #3692 from ywk253100/171127_repo_desc 
Add update repository API to support description of repository
 2017-12-04 17:25:38 +08:00
Wenkai Yin
594d213630 Publish replication notification for manual, scheduel and immediate trigger 2017-12-04 15:07:30 +08:00
Deng, Qian
092c19c666 Bump UI lib version to 0.5.16 2017-11-29 17:41:19 +08:00
Wenkai Yin
7ccdce33a0 Refactor ping target API 
Merge ping target API by ID into ping target API
 2017-11-29 17:15:03 +08:00
Wenkai Yin
34f70ff3b6
Merge pull request #3693 from ywk253100/171127_schedual_trigger 
Implement schedual trigger for replication
 2017-11-28 13:43:01 +08:00
Wenkai Yin
fa85ad6d28
Merge pull request #3687 from ywk253100/171123_trigger_api 
Add replication manual trigger API & update replication/policy API docs
 2017-11-28 13:38:53 +08:00
Daniel Jiang
d13321f2b5
Support getting user info via token in UAA Client (#3686) 2017-11-27 18:13:36 +08:00
Wenkai Yin
4902fdf2ef Implement schedual trigger for replication 2017-11-27 16:50:35 +08:00
Wenkai Yin
6b0ee138e5 Implement immediate trigger and the methods of WatchList 2017-11-27 14:23:21 +08:00
Wenkai Yin
8d9af50bbc Add update repository API to support description of repository 2017-11-27 14:18:57 +08:00
stonezdj
1179769e31 Update with PR review comment 2017-11-24 14:53:34 +08:00
stonezdj
16243cfbbc Add LDAP remote certifcate validation 
push test

Add unit test for ldap verify cert

remove common.VerifyRemoteCert

Update code with PR review comments

Add change ldaps config and add UT testcase for TLS feature

add ldap verfiy cert checkbox about #3513

Draft harbor ova install guide

Search and import ldap user when add project members

Add unit test case for SearchAndImportUser

ova guide

Add ova install guide

Add ova install guide 2

Add ova install guide 3

Call ValidateLdapConf before search ldap

trim space in username

Remove leading space in openLdap username

Remove doc change in this branch

Update unit test for ldap search and import user

Add test case about ldap verify cert checkbox

Modify ldap testcase
 2017-11-24 12:41:51 +08:00
Wenkai Yin
1c338ed30b Add replication manual trigger API & update replication/policy API docs 2017-11-24 10:50:10 +08:00
Deng, Qian
6b6cff0174 fix Chinese text of public policy 2017-11-22 20:15:08 +08:00
Tan Jiang
b3e0af2382 Fix permission issue in job_log directory 2017-11-21 19:31:15 +08:00
Wenkai Yin
59c1160edd Setup/Unset trigger when CURD policies 2017-11-20 17:09:46 +08:00
Fuhui Peng (c)
61cbab8ffe Delete verify remote cert in VIC mode about #3626 2017-11-17 17:01:23 +08:00
Fuhui Peng (c)
6fb9068034 Merge branch 'master' of https://github.com/vmware/harbor 2017-11-17 16:34:15 +08:00
Fuhui Peng (c)
2ff41664b2 Add setting.json about skinnable #3241 2017-11-16 15:36:46 +08:00
Wenkai Yin
31cf6c078e Implement replication policy manager 2017-11-16 10:55:03 +08:00
Deng, Qian
01390e2180 present config item based on installation of clair & notary 2017-11-14 15:11:37 +08:00
pengpengshui
91faac070f
Merge pull request #3598 from pengpengshui/master 
Modiy test connection without verify cert value
 2017-11-14 14:37:01 +08:00
Fuhui Peng (c)
f03a1b0f3e modiy test connection without verify cert value 2017-11-13 13:56:57 +08:00
Daniel Jiang
a2f20801c0
Merge pull request #3597 from ywk253100/171110_bug_fix 
Add content-type header to the request when creating project during replication
 2017-11-12 22:54:15 -06:00
Wenkai Yin
9889896e8a Add content-type header to the request when creating project during replication 2017-11-10 16:08:13 +08:00
Steven Zou
c2e0c8d1f2 Define the related interfaces for triggers and core controllers of replication service 2017-11-10 15:06:24 +08:00
Wenkai Yin
41c0ff66ce
Merge pull request #3534 from ywk253100/171101_poilicy 
Update replication policy API to support trigger and filter
 2017-11-10 14:00:17 +08:00
Wenkai Yin
ef0556d3f8
Merge pull request #3541 from ywk253100/171102_filter_chain 
Implement filter chain
 2017-11-10 10:42:25 +08:00
reasonerjt
19a13e8575 Deprivilege harbor-ui harbor-jobservice harbor-adminserver 
Use non-root user to run the service within these docker images, and provide HEALTHCHECK
mechanism.
 2017-11-09 03:09:09 -08:00
Wenkai Yin
149b628292 update 2017-11-09 16:20:56 +08:00
Wenkai Yin
3e3baa03f4 Merge remote-tracking branch 'upstream/replication_enhancement' into 171101_poilicy 
Conflicts:
	src/replication/consts.go
 2017-11-08 18:51:56 +08:00
Wenkai Yin
5cef58baa1 update according to the comments 2017-11-08 17:53:41 +08:00
Wenkai Yin
049642e894 Implement filter chain 2017-11-08 16:51:11 +08:00
Daniel Jiang
8dfe5f0bfc
Merge pull request #3536 from ywk253100/171102_fail_earlier 
Fail earlier when found database schema dismatch
 2017-11-07 15:01:14 +08:00
Wenkai Yin
f86a4be84d Implement Convert interface 2017-11-07 14:34:12 +08:00
Wenkai Yin
5293a9287b Fail earlier when found database schema dismatch 2017-11-07 13:07:56 +08:00
Tan Jiang
512384722a Make the internal URL of UI and JobService configurable 2017-11-03 20:43:25 +08:00
Daniel Jiang
795d33a45a
Add filter on API endpoints to mitigate XSRF (#3542) 
Add filter for all API endpoints to allow the POST requests which have
application/json header.
Make update to UI code to make sure all requests contain the header.
 2017-11-03 14:43:27 +08:00
Steven Zou
abe3d37a33 Add registry adaptor interface and sourcer definitions 2017-11-02 17:10:15 +08:00
Wenkai Yin
51d5df0849 Update replication policy API to support trigger and filter 2017-11-02 14:59:26 +08:00
Steven Zou
87d966e369
Merge pull request #3510 from steven-zou/master 
Update the alternate policy and corresponding task to support byweekly
 2017-11-01 21:51:04 -05:00
Fuhui Peng (c)
48cbdcbb08 change package version 2017-11-01 18:45:11 +08:00
Fuhui Peng (c)
30a60e6115 Merge branch 'master' of https://github.com/vmware/harbor 2017-11-01 18:36:37 +08:00
Deng, Qian
bd2bb0a697 fix project admin can view project config 2017-11-01 16:40:01 +08:00
Wenkai Yin
82b400c049 Add replication filter implement 2017-11-01 14:59:44 +08:00
Deng, Qian
091f68e5b0 fix tag vulnerability text to uppercase 2017-11-01 14:39:25 +08:00
Steven Zou
cee0bcec22 Update the alternate policy and corresponding task to support by weekly besides daily 2017-11-01 13:55:56 +08:00
Deng, Qian
0045b269db fix bug when save policies 2017-11-01 10:31:21 +08:00
Fuhui Peng (c)
29cf632de8 modify the remote cert checkbox value 2017-10-31 19:39:07 +08:00
Wenkai Yin
094a4f48ab
Merge pull request #3490 from ywk253100/171030_meta_id 
Add column id to table project_metadagta as the primary key
 2017-10-31 00:42:04 -05:00
pengpengshui
26cf27f327
Merge pull request #3475 from pengpengshui/master 
add checkbox on config-email page and test code, modify project access level label
 2017-10-31 10:42:07 +08:00
Wenkai Yin
0ddca31355 Add column id to table project_metadagta as the primary key 2017-10-30 17:37:25 +08:00
Deng, Qian
1840aefea9
Merge pull request #3461 from ninjadq/fix_scanning_bar_title 
fix text of bar chart title
 2017-10-30 00:02:08 -05:00
Steven Zou
3565f60f5b
Merge pull request #3473 from steven-zou/master 
Define filter interfaces for replication service
 2017-10-29 23:37:30 -05:00
Fuhui Peng (c)
ad38106642 modify label about project access level 2017-10-30 10:39:19 +08:00
Fuhui Peng (c)
a0172bc0c4 "add insecure checkbox to configure #3363" 2017-10-30 10:29:47 +08:00
Deng, Qian
fe4f611e73 fix text of bar chart title 2017-10-27 19:19:40 +08:00
Steven Zou
410908d863 Merge branch 'master' of https://github.com/steven-zou/harbor into fork_master 2017-10-27 18:19:39 +08:00
Wenkai Yin
5b2ececae8 Merge pull request #3436 from ywk253100/171020_meta_api 
Add project metadata API
 2017-10-27 05:16:50 -05:00
Steven Zou
e2242cffd2 define filter interfaces for replication service including:interface Filter,Converter and FilterChain and other supporting models 2017-10-27 18:16:16 +08:00
Wenkai Yin
c355034c14 Add project metadata API 
Project metadata API can be used to integrated with project management
service which can not provide all metadatas needed by Harbor.
 2017-10-27 17:05:15 +08:00
Deng, Qian
69ffd7117c add ui for project level policy 2017-10-27 15:18:00 +08:00
Daniel Jiang
d8634290e8 Merge pull request #3420 from reasonerjt/master 
Add Unit test cases for Clair Client.
 2017-10-23 12:18:05 +08:00
Tan Jiang
b925569767 Add Unit test cases for Clair Client. 2017-10-22 21:54:04 +08:00
Wenkai Yin
2156750b04 Move certificate verification to target level 
The certificate verification is on system level before this commit. Moving it
to target level makes the configuration more flexible for different targets.
 2017-10-20 15:36:56 +08:00
Wenkai Yin
66b2d0d3f3 Apply project level policies to standalone Harbor 
The following features are only enabled in integration mode, this commit moves
these to standalone Harbor:
 - Content trust policy: only signed images can be pulled
 - Vulnerability policy: only images whose severity is below the threshold can be pulled
 - Automatic scan policy: automatic scan pushed images
 2017-10-19 17:33:28 +08:00
Steven Zou
a5ca531819 Merge pull request #3338 from pengpengshui/master 
fix issue about pull command in repository  #3275
 2017-10-18 21:28:53 -05:00
Fuhui Peng (c)
a5a62e1b19 add customSkin about #3241 2017-10-17 10:46:23 +08:00
Tan Jiang
eab6b43d99 Make the root CA certificate of UAA should be configurable 2017-10-16 17:40:29 +08:00
Fuhui Peng (c)
eacb8e5658 Merge branch 'master' of https://github.com/vmware/harbor 2017-10-12 12:58:51 +08:00
Fuhui Peng (c)
54e0d34f7f fix issue about pull command in repository 2017-10-12 10:35:48 +08:00
Steven Zou
46814206bb Merge branch 'master' into master 2017-10-11 02:10:50 -05:00
Tan Jiang
51286d9baa Provide UAA authenticator for password based authentication. 2017-10-07 00:16:53 +08:00
Wenkai Yin
e495357d98 implement the default project metadata manager 2017-09-28 16:17:51 +08:00
Steven Zou
07b6934c9d add video demo references (both youtube and v.qq)to the readme.md and the user guide 2017-09-27 12:53:59 +08:00
Steven Zou
546a8327aa Merge remote-tracking branch 'upstream/master' 2017-09-27 10:59:15 +08:00
Wenkai Yin
e79334a445 Add interfaces to implement project level policy (#3271) 
* add interfaces to implement project level policy
 2017-09-26 16:41:08 +08:00
Deng, Qian
9e0961b3f4 fix_tag_link_and_scanning_state 2017-09-26 13:54:42 +08:00