Commit Graph

1512 Commits

Author SHA1 Message Date
stone
ec173305a3
Merge pull request #3974 from stonezdj/ldap_ping_timeout
Setting timeout for ldap ping
2018-01-12 11:22:27 +08:00
Tan Jiang
a392a8dc29 Provide API to rename admin
This is to provide a workaround for very corner case that in user's
authentication backend (LDAP, UAA) has a user called "admin" and because
Harbor's super user is hard coded to "admin" it's not possible to login
the "admin" with credentials in LDAP or UAA.

To minimize the impact, we'll provide an internal API for user to update
the super user's username from "admin" to "admin@harbor.local", this API
can be called by "admin" only, and is not reversible.
2018-01-11 23:01:06 +08:00
stonezdj
c48c7f7b6a Setting timeout for ldap ping 2018-01-10 15:14:30 +08:00
pengpengshui
7831a01f26
Merge pull request #3934 from pengpengshui/batchDelection
Modify filters' position and  modify member module switch members' ap…
2018-01-10 14:50:52 +08:00
Wenkai Yin
e26b442c9c
Merge pull request #3951 from ywk253100/180104_replicate_interval
Manual starting replication will be rejected if there are pending/running jobs
2018-01-10 10:56:45 +08:00
pfh
49160e6b13 Modify repository filter's position and inline alert text position
Modify issues about pagination and signed display

Modify test case about member
2018-01-09 14:48:25 +08:00
Wenkai Yin
7da89ec39b Passing tag as a parameter or the value will be overwritten 2018-01-08 15:23:35 +08:00
Daniel Jiang
f8af1f275e
Merge pull request #3911 from stonezdj/ldap_search_level
Ambiguous UI and internal values ldap_scope
2018-01-08 14:53:55 +08:00
Daniel Jiang
093e2bead2
Merge pull request #3950 from ywk253100/180105_ut
Add unit test for adding description of repository
2018-01-08 14:32:10 +08:00
pfh
93c524f5df Merge remote-tracking branch 'upstream/master' into batchDelection 2018-01-08 14:31:51 +08:00
pfh
9371bd41e8 Modify filters' position and modify member module switch members' apperence 2018-01-08 14:04:31 +08:00
Wenkai Yin
a9877c3e0a
Merge pull request #3905 from pengpengshui/repEnhance
Add new replication rule module
2018-01-05 18:19:11 +08:00
Wenkai Yin
87ce1c84d5 Manual starting replication will be rejected if there are pending/running jobs 2018-01-05 17:05:57 +08:00
Wenkai Yin
487c248227 Add unit test for adding description of repository 2018-01-05 16:52:48 +08:00
stonezdj
26b86984d2 Ambiguous UI and internal values ldap_scope #3764 2018-01-05 15:51:37 +08:00
pfh
162878a95c Modify test case and merge master 2018-01-05 15:39:52 +08:00
pfh
13308ce9d8 Merge remote-tracking branch 'upstream/master' into repEnhance 2018-01-05 14:09:03 +08:00
Qian Deng
f20103dc0c
Merge pull request #3906 from ninjadq/sidenav_to_verticalnav
Replace Navigation bar from Sidenav to Vertical Nav
2018-01-04 18:32:04 +08:00
Wenkai Yin
51297cdfd7
Merge pull request #3887 from ywk253100/171227_ssrf
Fix SSRF security issue #3755 in ping target, email server and LDAP server APIs
2018-01-04 18:11:47 +08:00
Deng, Qian
2122503599 Replace Navigation bar from Sidenav to Vertical Nav
1. Replace Sidenav to VerticalNav
2. Update related test case
3. Move Endpoint and Repliction to two different label
2018-01-04 17:24:38 +08:00
pengpengshui
a75f347fd4
Merge pull request #3910 from pengpengshui/skinable
Modify skinnable json file and modify images path about #3909 #3879
2018-01-04 16:12:59 +08:00
Fuhui Peng (c)
7845405862 Modify skinnable json file and modify image path about #3909 #3879 2018-01-04 14:26:41 +08:00
Daniel Jiang
8e5115c832
Merge pull request #3870 from stonezdj/ldap_syncuser2
Sync user email in ldap #3663
2018-01-04 13:28:51 +08:00
Wenkai Yin
3448fd9a2d Fix SSRF security issue #3755 in ping target, email server and LDAP server APIs 2018-01-04 12:26:17 +08:00
Wenkai Yin
8e4e5e8b54 Add unit test cases for replication codes 2018-01-03 18:39:30 +08:00
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
Wenkai Yin
73babbf1ab Modify unique constraint of table harbor_label
Add unique constraint to column name, scope and project_id  of table harbor_label to make creating same name labels under different projects valid
2017-12-19 22:15:56 +08:00
Steven Zou
2dd5b01fc4
Merge pull request #4773 from steven-zou/fix_js_restarting_issue
Fix the issue of intermittent restarting of job service
2018-04-26 15:05:32 +08:00
Steven Zou
e1b509e3f3 Fix the issue of intermittent restarting of job service
github issue: #4712
ping redis server before pool starting

Let worker pool to restart the message server if message server exits with error (controlled by max retries)
2018-04-25 17:02:16 +08:00
Wenkai Yin
8d62d989a5 Fix bug #4791
Remove the table join when querying repositories with project name
2017-12-19 21:47:39 +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
Fuhui Peng (c)
148c6ecc53 fix issue about replication rule delete and username autocomplete and… … 2017-09-21 15:45:42 +08:00
Wenkai Yin
dc4f2ece72 readjust package structure 2017-09-20 15:24:19 +08:00
Wenkai Yin
5cd55220c8 Merge pull request #3244 from ywk253100/170919_golint
Fix code style issues reported by golint
2017-09-20 10:31:28 +08:00
Wenkai Yin
f0946b63cf fix code style issues reported by golint 2017-09-19 17:16:54 +08:00
Wenkai Yin
82dc758064 Merge pull request #3213 from ywk253100/170914_image_size
Return image size when getting detail information of tag
2017-09-19 17:09:49 +08:00
Wenkai Yin
8d7644b8b5 Merge pull request #3151 from ywk253100/170830_email_insecure
Expose the insecure flag for email configuration
2017-09-15 15:01:30 +08:00
Wenkai Yin
2ebcc454ba support image size 2017-09-15 13:34:23 +08:00
weibaohui
84d66d85fa Correct spelling
Correct spelling
2017-09-11 15:13:24 +08:00
Steven Zou
9987d89705 enable server end pagination for project list 2017-09-08 19:15:50 +08:00
Wenkai Yin
bb77ceebae Merge remote-tracking branch 'upstream/master' into 170830_email_insecure 2017-09-04 15:10:24 +08:00
Wenkai Yin
923a8d65b1 expose insecure flag in api 2017-09-04 15:10:07 +08:00
Fuhui Peng (c)
c98e1cc29e harbor-ui version 2017-08-30 14:40:14 +08:00
Fuhui Peng (c)
7b0afc4032 Merge branch 'master' of https://github.com/vmware/harbor into uitest 2017-08-30 13:55:07 +08:00
Fuhui Peng (c)
2987eb3e28 fix issue about view log 2017-08-30 13:30:53 +08:00
Yan
1a71b13591 update error format (#3125)
* update error format

update

update

update

update

update

update

* update

* update
2017-08-29 19:17:08 +08:00
Fuhui Peng (c)
1d63deb742 fix issue about il8n about deleting repository 2017-08-28 11:25:17 +08:00
Yan
97f73dbf6c block pull scan failed image (#3119) 2017-08-28 10:30:59 +08:00
Daniel Jiang
f41d2ff436 Merge pull request #3101 from ywk253100/170822_replica
Convert 500 error returned by Admiral to duplicate project error when creating duplicate project
2017-08-22 15:59:19 +08:00
Wenkai Yin
599d94be0c update 2017-08-22 15:22:25 +08:00
Steven Zou
749435ccf3 Merge pull request #3102 from steven-zou/master
Fix projetcId not ready and ca download link issues
2017-08-22 14:53:45 +08:00
Wenkai Yin
ffb2f4201b update 2017-08-22 14:28:45 +08:00
Steven Zou
d2540b71f5 fix ca download link issue 2017-08-22 13:57:23 +08:00
Wenkai Yin
bb958a7f4b convert 500 error returned by Admiral to duplicate project error when creating duplicate project 2017-08-22 13:34:06 +08:00
Steven Zou
3784c08e3d Fix the projectId not ready issue 2017-08-22 13:33:24 +08:00
Tan Jiang
c1bbcb5bab update the interval of clair updater to 12 hours, and update the interval for scan all to 2 hours 2017-08-21 13:45:23 +08:00
Steven Zou
5deff12550 update ui library version 2017-08-18 18:50:42 +08:00
Fuhui Peng (c)
45c4796486 '1918' 2017-08-18 17:42:50 +08:00
Fuhui Peng (c)
7393843bd0 '3022' 2017-08-18 17:41:03 +08:00
Fuhui Peng (c)
e4af0bdb10 Merge branch 'master' of https://github.com/vmware/harbor 2017-08-18 16:16:52 +08:00
Wenkai Yin
7296bdc131 increase length of username in database to 256 2017-08-17 15:24:34 +08:00
pengpengshui
b362e4d36a fix issue about cannot click add replication button , 3071 2017-08-17 14:59:25 +08:00
pengpengshui
160593a86a fix issue about no warn when deleting repository which contains signed tags, 3022 2017-08-17 14:45:13 +08:00
pengpengshui
78e1f8c8ce fix issues about image have no data an scan complete time in image detail ,3054,3023 2017-08-17 14:42:36 +08:00
pengpengshui
04929c98f7 fix issue about back to public project #1918 2017-08-17 14:29:23 +08:00
pengpengshui
613dfc597d fix #3046 about delete ID from 'copy Digest ID' 2017-08-17 13:02:07 +08:00
Tan Jiang
2ffcf10eaa restart scan jobs when jobservice is started 2017-08-16 17:24:41 +08:00
Wenkai Yin
bb00c2c2cf Merge pull request #3045 from ywk253100/170814_config
[BAT]Remove useless attributes in configuration API
2017-08-15 12:18:06 +08:00
Steven Zou
df6d37b9d5 Merge pull request #3043 from steven-zou/master
add CVE link
2017-08-14 17:57:19 +08:00
Wenkai Yin
0ffb74f261 remove useless attributes in configuration API 2017-08-14 16:42:25 +08:00
Steven Zou
4a543a3e52 add CVE link 2017-08-14 15:56:55 +08:00
Yan
d0103856f1 [BAT] fix issues (#3037)
* fix issues

* update
2017-08-14 15:19:48 +08:00
Wenkai Yin
c878a4df06 Merge pull request #3033 from ywk253100/170811_scope
Fix bug in parsing scope
2017-08-11 17:56:49 +08:00
Wenkai Yin
98d8b7e246 fix bug in parsing scope 2017-08-11 14:13:15 +08:00
Daniel Jiang
1403fe09ff Merge pull request #3030 from reasonerjt/fix-jobservice-update-vuln-bug
Do not throw error if the scan result is unchanged
2017-08-11 13:26:15 +08:00
Daniel Jiang
9b6ad0e90f Merge pull request #3027 from reasonerjt/add-vuln-link
add cve link in Harbor API
2017-08-10 19:44:06 +08:00
Tan Jiang
882683ae6f Do not throw error if the scan result is unchanged 2017-08-10 17:26:39 +08:00
Wenkai Yin
ec5c5514b5 Merge pull request #3025 from ywk253100/170808_bug_fix
Fix bug: can not display signed or not correctly
2017-08-10 17:11:27 +08:00
Tan Jiang
5846d7d28d add cve link in Harbor API 2017-08-10 15:27:30 +08:00
Wenkai Yin
c3c21586ea fix bug: can not display signed or not correctly 2017-08-10 15:12:52 +08:00
Wenkai Yin
9b9b5e414f Merge pull request #3021 from ywk253100/170808_bug_fix
[BAT] Fix bug: can delete repository contains signed tags
2017-08-10 13:28:45 +08:00
Wenkai Yin
7205d03106 bug fix 2017-08-10 11:09:04 +08:00
Wenkai Yin
9fc80a1731 Merge pull request #3014 from ywk253100/170808_bug_fix
Return isSystem when using ldap
2017-08-09 18:49:49 +08:00
Wenkai Yin
689994fa93 return isSystem when using ldap 2017-08-09 18:02:55 +08:00
Daniel Jiang
5ba363657f Merge pull request #3006 from ywk253100/170808_bug_fix
[BAT]Remove useless codes
2017-08-09 16:05:16 +08:00
Daniel Jiang
78bacbc80a Merge pull request #2978 from wy65701436/issue-2975
Issue 2975
2017-08-09 16:05:00 +08:00
Wenkai Yin
7fedca3a4a remove useless codes 2017-08-09 15:13:51 +08:00
Steven Zou
be0b621c65 update the library version 2017-08-09 15:03:33 +08:00
Wenkai Yin
3c64ae340e bug fix 2017-08-08 16:22:29 +08:00
Steven Zou
49f52ef8f8 Merge pull request #2987 from pengpengshui/master
[BAT]fix #2986 about configration save button issue
2017-08-08 16:10:08 +08:00
pengpengshui
700d3141b4 fix #2986 about configration save button issue 2017-08-08 15:13:58 +08:00
Daniel Jiang
383a09e21f Merge pull request #2982 from reasonerjt/tc-vuln-data
add tc for vulnerability transform
2017-08-08 12:15:54 +08:00
pengpengshui
fb8e700e30 fix bug about tooltips issues 2017-08-08 09:59:36 +08:00
Steven Zou
b6b232ce6a Merge pull request #2945 from vmware/fix_issue_#2762
Fix data race issues of go sources
2017-08-07 21:57:03 +08:00
Tan Jiang
5b6c53a1bf add the json file required by UT 2017-08-07 21:12:49 +08:00
wangyan
657d3c322f fix issue 2975
udpate

update

update

update

update

update
2017-08-07 18:01:37 +08:00
Tan Jiang
8f41be471d add tc for vulnerability transform 2017-08-07 17:14:51 +08:00
Steven Zou
21d3f4a549 Fix data race issues of go sources 2017-08-07 14:50:37 +08:00
Wenkai Yin
7800d2c2b2 check the existence of project when generating token 2017-08-07 13:30:16 +08:00
Steven Zou
43ca7e33fa Merge pull request #2971 from steven-zou/master
upgrade ui lib version to 0.4.2
2017-08-04 21:16:19 +08:00
Daniel Jiang
6bd622196e Merge pull request #2972 from reasonerjt/master
Fix perf issue and connection leak in Clair.
2017-08-04 19:48:26 +08:00
Tan Jiang
fa0cb8731c Fix performance issue and connection leakage 2017-08-04 19:22:52 +08:00
Steven Zou
373c6a3783 upgrade ui lib version to 0.4.2 2017-08-04 19:21:38 +08:00
Daniel Jiang
d4dce3bb60 Merge pull request #2970 from wy65701436/issue-2965
fix 2965
2017-08-04 19:17:01 +08:00
wangyan
5b54b554ab update 2017-08-04 18:59:16 +08:00
Steven Zou
325eb6bbc1 Merge pull request #2969 from pengpengshui/master
fix #2893 about add tooltips title
2017-08-04 18:58:23 +08:00
wangyan
bcc1a5c41d fix 2965
update package

update
2017-08-04 18:44:00 +08:00
pengpengshui
89b56eaea0 fix #2893 about add tooltips title 2017-08-04 18:34:12 +08:00
Steven Zou
39ffff7c84 update ui library version to 0.3.92 2017-08-04 10:37:38 +08:00
Wenkai Yin
d5a6d25082 Merge pull request #2923 from ywk253100/170728_registry
Remove useless insecure flag
2017-08-04 10:14:40 +08:00
Steven Zou
1c3830086a Merge pull request #2959 from pengpengshui/master
fix #2889 #2892 about tooltips of self-registration and member model add button problem
2017-08-04 10:03:26 +08:00
pengpengshui
21379a1d3d fix #2889 #2892 about tooltips of self-registration and member model add button problem 2017-08-04 09:44:20 +08:00
Steven Zou
baa863d026 Fix issue #2879 (#2953)
* Change vul result bar texts

* Support server-driven pagination for replication jobs
2017-08-03 15:09:13 +08:00
pengpengshui
0966887f98 fix #2909 about time can be empty 2017-08-03 13:38:27 +08:00
pengpengshui
3417ff731b fix #2910 about scan all position 2017-08-03 12:32:29 +08:00
pengpengshui
cd1077fa43 fix 2912 #2938 about save button in vul tag and signed icon 2017-08-02 19:07:30 +08:00
Daniel Jiang
6f8f765358 Merge pull request #2906 from ywk253100/170728_integration
Apply security filter to certain patterns and enable basic auth for deleting repo
2017-08-02 18:09:15 +08:00
pengpengshui
e76a76e60c fix #2890 about time in vulnerablity 2017-08-01 18:30:47 +08:00
Steven Zou
e7da22d812 fix issue #2840 and #2916 2017-08-01 15:49:50 +08:00
pengpengshui
87b0f3460e fix color about #2908 2017-08-01 12:34:08 +08:00
pengpengshui
d666574f66 fix #2903 #2908 about icons color and statistics style 2017-07-31 17:20:27 +08:00
pengpengshui
8ca28446d4 fix #2917 about scan error log does`t show 2017-07-31 17:15:36 +08:00
pengpengshui
39aaf2928f fix #2911 about spaces at the begin of log 2017-07-31 17:12:28 +08:00
Wenkai Yin
67200db678 update 2017-07-31 13:58:41 +08:00
Wenkai Yin
8963a15520 remove useless insecure flag 2017-07-31 13:45:49 +08:00
pengpengshui
52bcb8a643 Merge branch 'master' of https://github.com/vmware/harbor 2017-07-31 12:42:28 +08:00
pengpengshui
468257167a fix #2896 #2886 #2888 about tooltips,inline alert ,datagrid leftside style 2017-07-29 06:19:46 +08:00
Steven Zou
220e709530 support read-ony mode for replication list view (#2915) 2017-07-28 18:49:17 +08:00
Wenkai Yin
cdb75519a9 1. only apply security filter to /api/ and /service/ 2.support basic auth for deleting repository and tag in integration mode 2017-07-28 15:25:22 +08:00
Wenkai Yin
ce169e74dc Merge pull request #2878 from ywk253100/170724_registry
Refactor registry client
2017-07-28 13:40:32 +08:00
Wenkai Yin
eb9a4dfff9 update 2017-07-28 13:21:34 +08:00
Wenkai Yin
a8dc75dd15 update 2017-07-28 13:10:26 +08:00
Steven Zou
1467a8a5be Merge pull request #2900 from steven-zou/master
fix issue #2435
2017-07-28 12:43:42 +08:00
Steven Zou
d7eb8df28e Merge pull request #2885 from pengpengshui/master
fix 2869/2870 about the  log of a pending status replication job
2017-07-27 21:43:01 +08:00
pengpengshui
be9dd5cdc3 fix 2869/2870 about the log of a pending status replication job 2017-07-28 07:17:55 +08:00
Steven Zou
5f548ea49a fix issue #2435 2017-07-27 18:43:27 +08:00
Wenkai Yin
1da9b8653b update according to the comments 2017-07-27 18:23:55 +08:00
Daniel Jiang
8117e9ee79 Merge pull request #2884 from ywk253100/170726_api
Add API to check whether a project can be deleted or not
2017-07-27 10:29:03 +03:00
Wenkai Yin
9d7ad6de68 Add API to check whether a project can be deleted or not 2017-07-27 14:08:32 +08:00
Wenkai Yin
0a74a0f1e4 update 2017-07-27 08:17:29 +08:00
Wenkai Yin
71e4c3c447 Merge remote-tracking branch 'upstream/master' into 170724_registry
Conflicts:
	src/ui/utils/utils.go
2017-07-26 18:46:41 +08:00
Wenkai Yin
cc264f85e7 do not ping if using raw token authorizer 2017-07-26 18:41:36 +08:00
Steven Zou
f3c1caeb3c fix issue #2811 2017-07-26 17:58:43 +08:00
Steven Zou
ec7b5ccfea fix issue #2832 2017-07-26 16:55:20 +08:00
Steven Zou
5c32719590 Merge pull request #2872 from steven-zou/master
fix issue 2858
2017-07-26 16:09:42 +08:00
Daniel Jiang
69c49dd7d1 Merge pull request #2856 from reasonerjt/project-scan-all
Provide API for scanning images under a project
2017-07-26 10:58:58 +03:00
Daniel Jiang
9d02fc1c70 Merge pull request #2866 from reasonerjt/master
fix #1953, fail jobservice when configuration init encounters errors.
2017-07-26 10:58:04 +03:00
Steven Zou
7244134e50 fix issue 2858 2017-07-26 15:51:37 +08:00
Tan Jiang
10c8573464 provide API for scanning images under a projet 2017-07-26 15:19:17 +08:00
Steven Zou
7a0fe1034a Merge pull request #2871 from pengpengshui/master
fix #2839 about project log has no logs
2017-07-26 12:55:26 +08:00
pengpengshui
1fd68529ae fix #2839 about project log has no logs 2017-07-26 10:44:06 +08:00
pengpengshui
e4c21dc5de change code style again about replication rule link issue 2017-07-26 05:58:15 +08:00
pengpengshui
9c6c71ed72 modify code about replication rule link issue 2017-07-26 04:16:21 +08:00
pengpengshui
30bd67748e fix #2853 about replication rule link issue 2017-07-26 03:51:47 +08:00
Tan Jiang
97b334c3c0 fix #1953 2017-07-25 21:12:03 +08:00
Steven Zou
7c2699953d Fix config change watching issue 2017-07-25 20:27:25 +08:00
Steven Zou
a047c1fe96 Merge pull request #2850 from steven-zou/master
Enhance scanning status controlling
2017-07-24 14:26:29 +08:00
Steven Zou
598f2b43db add missing i18n message keys 2017-07-24 13:49:43 +08:00
Steven Zou
97a9052050 Enhance scanning status controlling 2017-07-24 13:39:49 +08:00
Yan
274f764622 update interceptor error code (#2836)
* update interceptor error code

* update

* update error string

* update interceptor error code

update

update error string
2017-07-23 18:34:44 -07:00
Wenkai Yin
62c1bf5389 load absent property from env 2017-07-21 17:54:41 +08:00
Tan Jiang
cd24c0f171 fix issue in golint 2017-07-21 00:07:42 +08:00
Tan Jiang
ea25c3cfe5 provide api to show log of scan job 2017-07-20 19:32:27 +08:00
Wenkai Yin
b127ba391d Merge pull request #2827 from ywk253100/170720_replic
Fix replicate issue
2017-07-20 18:48:33 +08:00
Wenkai Yin
1c4a42009d remove duplicate codes in notification handler (#2828) 2017-07-20 03:10:52 -07:00
Wenkai Yin
2e427bffe2 fix replicate issue 2017-07-20 16:47:14 +08:00
Wenkai Yin
e0040a09b6 Merge pull request #2821 from ywk253100/170719_integration
Refactor getting project logic according to the change of Admiral's API
2017-07-20 15:57:42 +08:00
Wenkai Yin
d36a7585c3 Merge pull request #2818 from ywk253100/170719_delete_getctxofuser
Delete the method of getting security context of specific user
2017-07-20 15:57:21 +08:00
Steven Zou
1b2a538aaf Fix scan now issue in the tag list (#2824)
* Provide 'Scan Now' menu in the tag list

* Fix scan now issue in the tag list
2017-07-20 00:08:56 -07:00
Wenkai Yin
1298d465da refactor GetPublic logic 2017-07-20 10:34:18 +08:00
Steven Zou
aa681eb018 Provide 'Scan Now' menu in the tag list (#2819) 2017-07-19 18:28:00 -07:00
Wenkai Yin
603d15671a delete the method of getting security context of specific user 2017-07-19 18:05:50 +08:00
Wenkai Yin
75c4d4a60a Merge pull request #2816 from ywk253100/170719_trim
Trim the new line in the end of token file
2017-07-19 17:51:49 +08:00
Wenkai Yin
e9a2ee779f trim the new line in the end of token file 2017-07-19 17:34:04 +08:00
Steven Zou
e6368ab8a0 Merge pull request #2799 from vmware/fix_issue_#2793
Fix issue of detecting configuration changes
2017-07-19 17:32:45 +08:00
Wenkai Yin
f57b9ae9d5 trim new line in the end of token file 2017-07-19 17:28:54 +08:00
Steven Zou
8f921db588 Refine scheduler 2017-07-19 16:57:22 +08:00
Steven Zou
3120abad8e Merge pull request #2809 from steven-zou/master
Add job log reviewer
2017-07-19 16:43:23 +08:00
Daniel Jiang
8a23f0e0a1 Merge pull request #2812 from reasonerjt/systeminfo-scan-all
add next_scan_all to systeminfo api response
2017-07-19 15:49:57 +08:00
Steven Zou
056b15c74b Force refresh user list view 2017-07-19 15:27:59 +08:00
Steven Zou
9057f751e3 Implement job log viewer 2017-07-19 15:27:32 +08:00
Wenkai Yin
7573d59624 update token file location 2017-07-19 13:46:10 +08:00
Tan Jiang
ad2cafe4d2 add next_scan_all to systeminfo api response 2017-07-19 13:33:42 +08:00
Steven Zou
5c876621ec Merge branch 'master' into fix_issue_#2793 2017-07-19 12:34:43 +08:00
Wenkai Yin
6e10a21871 Merge pull request #2774 from ywk253100/170713_integration
Trim last / in url
2017-07-19 10:15:05 +08:00
Wenkai Yin
44ad4581e5 Merge pull request #2807 from ywk253100/170718_integration
Support basic auth in integration mode
2017-07-19 10:14:44 +08:00
pengpengshui
b16c521e2f Merge remote-tracking branch 'upstream/master' 2017-07-18 19:12:06 -07:00
pengpengshui
1810b7ed42 fix #2800 about consistent datagrid footer indicate number of items and roll back connent-test issue 2017-07-18 19:10:16 -07:00
pengpengshui
34f9a3b911 fix issue about endpontUrl,username,password should have data when connent-test button could click #2435 2017-07-18 14:00:17 -07:00
pengpengshui
8236e0358e fix #2775 about create-rule modal connect test issue 2017-07-18 09:50:04 -07:00
Wenkai Yin
fc2bb51582 support basic auth in integration mode 2017-07-18 19:20:19 +08:00
Daniel Jiang
7d5fe961f3 Merge pull request #2798 from reasonerjt/master
The password to access clair db can be configured in harbor.cfg
2017-07-18 18:56:51 +08:00
Steven Zou
201095a259 Enhance scanning policy notify handler and add more testing cases 2017-07-17 23:43:24 +08:00
pengpengshui
47e24609b6 change the code style of the issue create-project modal submit button 2017-07-17 17:35:10 -07:00
pengpengshui
26154aae55 change the code style of the issue create-project modal submit button 2017-07-17 17:07:46 -07:00
pengpengshui
fc857a8928 fix create-project modal submit button issue 2017-07-17 15:28:31 -07:00
pengpengshui
74169e3021 fix issue about nav replicationManagement lose highlight 2017-07-17 12:46:01 -07:00
Steven Zou
db58ca673d Fix issue of detecting configuration changes 2017-07-17 17:39:41 +08:00
Tan Jiang
629cf29850 The password to access clair db can be configured in harbor.cfg, skip auto-scan if clair-db is not ready 2017-07-17 15:25:47 +08:00
Daniel Jiang
6f2ff672c4 Merge pull request #2789 from reasonerjt/master
fix nil pointer issue
2017-07-14 20:37:00 +08:00
Tan Jiang
473b85cffa fix nil pointer issue 2017-07-14 20:06:34 +08:00
Steven Zou
203b8a5bf0 Merge pull request #2790 from steven-zou/master
Fix issue #2688 and #2686
2017-07-14 19:14:27 +08:00
Steven Zou
de6300a3b2 Fix issue #2688 and #2686 2017-07-14 18:54:49 +08:00
Steven Zou
bf8a05615b fix issue 2772 (#2785) 2017-07-14 02:03:58 -07:00
Steven Zou
4e33bd9e46 fix issue 2772 2017-07-14 16:39:40 +08:00
Steven Zou
c91189a560 Merge pull request #2784 from steven-zou/master
fix issue 2759
2017-07-14 16:25:19 +08:00
Steven Zou
b69083ecd1 Merge pull request #2779 from pengpengshui/master
Fix the issue #2564,#2552 and #2758
2017-07-14 16:01:22 +08:00
pengpengshui
900837326a fix the issue about project name set private/pubulic alert problem 2017-07-14 14:11:42 -07:00
pengpengshui
8ec00c479e fix2552 connect button grayed out 2017-07-14 09:28:20 -07:00
Steven Zou
fae35add8f fix issue 2759 2017-07-14 15:58:35 +08:00
Daniel Jiang
22ba87338e Merge pull request #2777 from reasonerjt/fetch-timestamp-from-clairdb
provide default timestamp for all distros in system info api
2017-07-14 15:32:27 +08:00
Tan Jiang
771e26a188 fix bug 2017-07-14 14:53:12 +08:00
Steven Zou
a1a36a4cc4 Support backend server pagination in repo list (#2778)
* refine the test case of scheduler

* Fix bug

* Support root cert downloaded

* Fix code conflicts

* support clair db timestamps

* Support backend pagination in repository list
2017-07-13 20:58:53 -07:00
pengpengshui
be6e265890 Merge remote-tracking branch 'upstream/master' 2017-07-13 17:14:31 -07:00
pengpengshui
ea07c211e2 fix2564 issue 2017-07-13 10:37:13 -07:00
pengpengshui
66bfc02d5b fix2564 issue 2017-07-13 09:37:15 -07:00
Tan Jiang
72b3a020e3 provide default timestamp for all distros in system info api 2017-07-13 18:48:05 +08:00
Wenkai Yin
5c965719a2 trim / in url 2017-07-13 17:12:53 +08:00
Daniel Jiang
920c41c204 Merge pull request #2769 from ywk253100/170713_integration
Bug fix
2017-07-13 16:47:43 +08:00
Daniel Jiang
0501f52cda Merge pull request #2765 from ywk253100/170712_member
Fix bug in GET member API
2017-07-13 16:47:19 +08:00
Wenkai Yin
c4fbc707af bug fix 2017-07-13 13:58:24 +08:00
Steven Zou
0ce74dd377 Support clair db timestamps (#2767)
* refine the test case of scheduler

* Fix bug

* Support root cert downloaded

* Fix code conflicts

* support clair db timestamps
2017-07-12 22:04:42 -07:00
Wenkai Yin
d51b01c200 fix bug in GET member API 2017-07-12 19:17:26 +08:00
Daniel Jiang
ca6bd3b585 Merge pull request #2741 from reasonerjt/fetch-timestamp-from-clairdb
read last update from clair db, return in system info
2017-07-12 17:16:30 +08:00
Tan Jiang
7fdb77f6d2 fix tc 2017-07-12 16:48:57 +08:00
Tan Jiang
436f0efab8 overall timestamp returns 0 when error happens, split check and mark into two func 2017-07-12 15:57:57 +08:00
Wenkai Yin
ba22ee5022 Merge pull request #2738 from ywk253100/170711_integration
Disable some APIs in integration mode
2017-07-12 15:13:50 +08:00
Tan Jiang
5f233f3e21 address comment 2017-07-12 15:05:27 +08:00
Steven Zou
8ffb5593b9 Merge pull request #2749 from pengpengshui/fix2688
fixed issue #2688
2017-07-12 14:20:29 +08:00
pengpengshui
982263bd66 delete one line 2017-07-12 13:51:51 -07:00
Daniel Jiang
9c8c79db43 Merge pull request #2740 from reasonerjt/query-clair-db
enable security on jobservice scan api
2017-07-12 13:24:16 +08:00
Steven Zou
76bb28d3d0 UI: Support root cert downloading in configuration component (#2742)
* refine the test case of scheduler

* Fix bug

* Support root cert downloaded

* Fix code conflicts
2017-07-11 22:23:19 -07:00
Wenkai Yin
005d783463 Merge pull request #2732 from ywk253100/170710_bug_fix
Bug fix
2017-07-12 12:59:24 +08:00
pengpengshui
003ae3a14f fixed issue #2688 2017-07-11 21:23:32 -07:00
Yan
c1fc09a2d9 format error to make it readable for docker (#2731)
remove unneeded
2017-07-11 19:36:51 -07:00
Tan Jiang
543cf62e14 read last update from clair db, return in system info 2017-07-11 21:26:31 +08:00
Tan Jiang
92258cd012 enable security on jobservice scan api 2017-07-11 21:22:27 +08:00
Wenkai Yin
7e8468c302 update 2017-07-11 18:49:25 +08:00
Wenkai Yin
52f9e5f1c8 disable some APIs in integration mode 2017-07-11 18:13:48 +08:00
Steven Zou
35c62da69c remove watch testing case 2017-07-11 15:53:04 +08:00
Steven Zou
cbdf49c8e9 Merge remote-tracking branch 'upstream/master' 2017-07-11 15:44:32 +08:00
Steven Zou
7ee052b9dd Update policy scheduler according to comments 2017-07-11 15:22:00 +08:00
Wenkai Yin
0de64ed139 bug fix 2017-07-10 18:38:21 +08:00
Daniel Jiang
6fa12cdb1e Merge pull request #2730 from reasonerjt/scan-all-control
restrict scan all API, it should be called once every a period of time
2017-07-10 16:17:26 +08:00
Tan Jiang
fb07b544ab address comment 2017-07-10 13:53:21 +08:00
Wenkai Yin
0b282039e9 Merge pull request #2725 from ywk253100/170707_status_code
Return real status code returned by admiral APIs
2017-07-10 10:12:50 +08:00
Tan Jiang
eb11cda596 restrict scan all API, it should be called once every a period of time 2017-07-09 22:06:13 +08:00
Tan Jiang
e1e975096c add int id for scan overview and revoke the change in beego 2017-07-09 12:37:08 +08:00
Daniel Jiang
43734bfb90 Merge pull request #2726 from reasonerjt/clair-notification
clair notification handler enhancements
2017-07-09 12:29:19 +08:00
Steven Zou
3cba51ef72 Merge pull request #2704 from m-masataka/change_gettags_interval
change tag retrive's timeout
2017-07-07 20:28:16 +08:00
Steven Zou
ff889cedde Fix conflict 2017-07-07 20:15:40 +08:00
Steven Zou
a0718385c1 Fix the import cycle issue 2017-07-07 20:12:01 +08:00