Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-12-26 02:28:06 +01:00
Code Issues Projects Releases Wiki Activity
5,422 Commits 55 Branches 321 Tags 340 MiB
95188de77f
Commit Graph

1822 Commits

Author SHA1 Message Date
stonezdj
b8a48d0326 Update security context for assign role to project group member 
The project list will contain all public projects, user is a member of this project, or user is in the group which is a member of this projects.
Change the behaviour of user roles, if the user is not a member of this project, then return the user's groups role of current project
 2018-05-03 16:49:16 +08:00
Steven Zou
9746f9f2a9
Merge pull request #4838 from ninjadq/cherry_pick_hardcode_url_back_master 
Fix URL hardcode on replication service
 2018-05-03 16:01:54 +08:00
Qian Deng
9e1e66beeb
Merge pull request #4839 from pengpengshui/language 
Modify issue about cannot switch language to franch
 2018-05-03 15:57:19 +08:00
Deng, Qian
8d79747085 Fix URL hardcode on replication service 
Url hardcoded in replication service. This commit is to fix it.
 2018-05-03 13:46:17 +08:00
pfh
80ff0e4553 Modify issue about cannot switch to franch 2018-05-02 15:48:55 +08:00
pfh
ad74297a14 Modify harbor-ui version 2018-05-02 15:41:47 +08:00
pfh
08f750b04d Merge remote-tracking branch 'upstream/master' into labelFilter 2018-05-02 14:14:15 +08:00
Wenkai Yin
e5efa034a8 Fix bug #4819: the scheduled rule can not be removed 
When checking the jobs of the rule which are going to be deleted, only get the transfer and delete jobs.
 2018-04-28 18:43:49 +08:00
Deng, Qian
6ba6dcd1d5 Fix bugs that some place hardcode url addr 
In the repositories and projects service some url is hardcoded.
 2018-04-28 01:07:15 +08:00
Deng, Qian
18c8686d57 Fix bugs infinity copy of reponame and auth 
1. everytime click deploy or add additional info will add a prefix before reponame
2. add constrait on button on cardview
 2018-04-28 00:50:57 +08:00
stone
413ae9a8cb
Merge pull request #4808 from stonezdj/master 
Merge pull request #4798 from stonezdj/release-1.5.0
 2018-04-27 18:44:05 +08:00
pfh
30fe99790b Modify images filter with label issue 2018-04-27 17:42:58 +08:00
Yan
ae257433cc
Fully migrate harbor db to postgresql (#4689) 
* Merge harbor db to postgres
 2018-04-27 02:27:12 -07:00
Wenkai Yin
f77e4167ac
Merge pull request #4802 from ywk253100/180427_label_db 
Modify unique constraint of table harbor_label
 2018-04-27 17:10:05 +08:00
stone
68cf63bbef Merge pull request #4798 from stonezdj/release-1.5.0 
Return 404 if user is not found
 2018-04-27 17:01:17 +08:00
pengpengshui
4dda6d8875
Merge pull request #4784 from pengpengshui/labelFilter 
Add sort fun when filter labels in tag page  #4617
 2018-04-27 15:35:45 +08:00
pfh
b520addf08 Add sort fun when filter label in tag page #4617 2018-04-26 10:24:25 +08:00
Qian Deng
ac8e5d6e25
Merge pull request #4768 from ninjadq/fix_bug_search_result 
Fix bug on search result ui
 2018-04-25 15:55:48 +08:00
pengpengshui
888379dfb5
Merge pull request #4764 from pengpengshui/addLock 
Fix issue about read only mode warning undisappear about #4741
 2018-04-25 13:17:11 +08:00
Wenkai Yin
54d6b08e7c
Merge pull request #4777 from reasonerjt/fix-clair-sev 
Fix mis-interpretation of severity in Clair
 2018-04-25 12:27:40 +08:00
pengpengshui
585bde163f
Merge pull request #4767 from pengpengshui/stickLabel 
Modify color panel and add labels to imgs frequently click problem
 2018-04-25 11:34:48 +08:00
Tan Jiang
93c448d91b Fix mis-interpretation of severity in Clair 
Currently "Critical" vulnerablity is treated as "Unknown" in Harbor.
This commit provides a quickfix that it will be interpret as "High".  In
future, we should consider introduce "Critical" and enable UI to handle
it to be more consistent with CVSS spec.
 2018-04-25 10:31:12 +08:00
Deng, Qian
456b0c40cb Fix bug on search result ui 
Fix issue #3852, After global search result returned if you research another item, the content will not refresh.
 2018-04-23 19:58:22 +08:00
pfh
566e867984 Modify color panel and add labels to imgs click problem 2018-04-23 19:07:44 +08:00
pfh
9994ea6974 fix issue about read only mode warning undisappear about #4741 2018-04-23 11:24:31 +08:00
pfh
f72a41694a Modify tooltips size about authentication 2018-04-23 10:51:37 +08:00
pfh
cdcaff10bf Modify click to registry under project 2018-04-20 21:30:40 +08:00
Deng, Qian
de0927578f Fix bug sent multiple scan request 
Every time after add lable or delte lable scan button will trigger multiple requests
 2018-04-20 19:42:04 +08:00
Steven Zou
6bab3310ae
Merge pull request #4755 from pengpengshui/replication 
Modify replication rule list not seleted when load first
 2018-04-20 19:29:13 +08:00
pfh
e92ef72902 Modify replication rule list not seleted first 2018-04-20 18:58:37 +08:00
Daniel Jiang
641f01eb0e
Merge pull request #4738 from steven-zou/fix_nil_job_logger_issue 
Return the logger.Interface instead of the pointer of logger to avoid nil checking issue
 2018-04-20 18:53:44 +08:00
Steven Zou
a17436962f Return the logger.Interface instead of the pointer of logger to avoid nil checking issue 2018-04-20 14:59:28 +08:00
Tan Jiang
1fc4142e1a Do not call chown to config files 
This commit fixes a recently discovered issue on Kubernetes #4496
It make necessary to avoid calling `chown` to config files during the
bootstrap of the containers.
 2018-04-20 13:44:21 +08:00
Steven Zou
4da4dd6694
Merge pull request #4717 from pengpengshui/breadScrumb 
Modify bread crumb for vic
 2018-04-19 19:24:27 +08:00
Steven Zou
850c09f3f4
Merge pull request #4723 from pengpengshui/skinnable 
Modify login bg image position about skinnable
 2018-04-19 17:32:02 +08:00
Fuhui Peng (c)
890cbb727c Modify harbor-ui version 2018-04-19 15:52:30 +08:00
Fuhui Peng (c)
9082b50bb9 Merge branch 'master' of https://github.com/vmware/harbor into breadScrumb 2018-04-19 15:34:20 +08:00
Steven Zou
6f83b9e563 Fix the issue of causing the UI UT cases failed 
downgrade the zone.js version to 0.8.19 and fix it
 2018-04-19 15:30:12 +08:00
Fuhui Peng (c)
3c42277651 Modify loginBg position about skinnable 2018-04-19 14:03:19 +08:00
Steven Zou
9a2b522a2f
Merge pull request #4720 from ninjadq/fix_default_view_to_card_view 
Fix default view problem and styles issues
 2018-04-19 13:46:55 +08:00
Fuhui Peng (c)
cdefac82e7 Delete needless code about breadcrueb 2018-04-19 12:28:13 +08:00
Fuhui Peng (c)
e41db9469e Merge remote-tracking branch 'upstream/master' into breadScrumb 2018-04-19 11:11:43 +08:00
Daniel Jiang
f8d577994f
Merge pull request #4719 from reasonerjt/fix-db-broken-pipe 
Fix intermittent `broken pipe` issue in log
 2018-04-19 10:23:59 +08:00
Deng, Qian
ca9de64cdb Fix default view problem and styles issues 
Set default view of repo to cardview
Fix card title style issue that break test
 2018-04-18 21:16:06 +08:00
Fuhui Peng (c)
8a41bcab93 Modify bread crumb for vic 2018-04-18 18:29:06 +08:00
Daniel Jiang
5792829951
Merge pull request #4706 from ywk253100/180418_admiral 
Fix bug #4688
 2018-04-18 18:23:24 +08:00
Tan Jiang
7fa8261661 Fix intermittent broken pipe issue in log 
This commit fixes #4713, by adopting the suggested fix in:
https://github.com/go-sql-driver/mysql/issues/529
When creating the DB instance in orm, call `SetConnMaxLifetime()`
 2018-04-18 17:39:13 +08:00
stone
2f1989d211
Merge pull request #4672 from ninjadq/fix_bug_search_member_by_username 
Add query string when get members
 2018-04-18 16:42:28 +08:00
Wenkai Yin 79628
f6bd2f245d Fix bug #4688 
Fix bug: the user can push images although he have no permisson by checking empty value before assign permissions.
 2018-04-18 12:03:06 +08:00
Deng, Qian
02b00724f9 Fix readonly mode show in vic and rewording the tooltip 
Hidden readonly mode on vic
Reword the tooltip
 2018-04-18 12:02:54 +08:00
Deng, Qian
cb79d1c38b Fix bugs on configuration save 
When configuration saving, an error undefined no atrribute toString will occur. This commit will fix it.
 2018-04-17 20:12:34 +08:00
Deng, Qian
c31fb5ddf2 Fix UI/UX issues and manuely refresh component when fresh 
1. Fix card-title text alignment
2. Trancate text in title if length greater then 29
3. Fix auto refresh data when loading next page in card-view
 2018-04-17 19:50:23 +08:00
pengpengshui
813f6d2ed2
Merge pull request #4684 from pengpengshui/labelCase 
Add filter images by label testcase
 2018-04-17 18:17:10 +08:00
Deng, Qian
286defa367 Add query string when get members 2018-04-17 15:36:29 +08:00
pfh
2989ad6c92 Delete a unused file 2018-04-17 10:57:21 +08:00
Qian Deng
0f271710ae
Merge pull request #4673 from ninjadq/fix_bug_4665 
Fix bug 4665 project admin can not change the role of some user
 2018-04-17 10:47:03 +08:00
pfh
786a082fff Fix issue about label filter and I18n 2018-04-17 10:22:46 +08:00
pfh
e9052dd42a Merge remote-tracking branch 'upstream/master' into fixIssue 2018-04-17 10:19:16 +08:00
Steven Zou
ca8d3bdcc9
Merge pull request #4638 from vmware/use_redis_url_addr 
Use redis URL address to replace host:port when connecting to redis server
 2018-04-17 10:12:51 +08:00
pfh
bd28eb4541 Add Filter Label about imgs 2018-04-17 10:08:19 +08:00
Deng, Qian
9eec96afd6 Fix bug 4665 project admin can not change the role of some user 2018-04-16 18:57:26 +08:00
stonezdj
7e57c685ac Add project member search by name 
Previous implementation contains the search user by name feature. This implementation can search user and user group by name.
 2018-04-16 18:38:10 +08:00
Daniel Jiang
63ad0efd4f
Merge pull request #4637 from ywk253100/180412_bugfix 
Bug fix
 2018-04-13 19:39:50 +08:00
Yan
ab4018e967
Fix readonly error message and push existing image bug (#4654) 2018-04-13 19:22:28 +08:00
Steven Zou
adc2f8f124 Use redis URL address to replace host:port when connecting to redis server 
replace tcp host:port with
'redis://arbitrary_usrname:password@ipaddress:port/database_index'

update prepare to generate config yaml file of job service based on harbor.cfg

update harbor.cfg default values
 2018-04-13 19:19:56 +08:00
pengpengshui
4ab135a7ed
Merge pull request #4645 from pengpengshui/fixIssue 
Fix issue about label filter #4636
 2018-04-13 11:33:59 +08:00
Wenkai Yin 79628
ed0effb9c2 Bug fix 
When deleting tags belonged to the same repository concurrently, the repository may be deleted by one API call and the other calls get 404. This commit logs a warning message and doesn't return 404.
 2018-04-13 10:57:22 +08:00
pfh
9ebe8d64da Fix issue about label filter #4636 2018-04-13 09:49:17 +08:00
wangyan
04816222c0 Update ci test images to busybox 2018-04-12 18:21:20 -07:00
Steven Zou
b5b728bee3 Fix the vulnerability issues in the job service code 
'Errors unhandled' in 'jobservice/job/impl/logger/job_logger.go'
'TLS InsecureSkipVerify set true' in 'jobservice/opm/hook_client.go'
 2018-04-12 15:12:39 +08:00
stonezdj
de49165427 Refactor project member API 
1) Remove the previous /api/projects/?:project_id/members/:userid
    2) Move the /api/projects/:project_id/projectmembers/?:pmid to
        /api/projects/:project_id/members/?:pmid
    3) Change the project member maintain ui to call new REST API
 2018-04-11 17:49:33 +08:00
Daniel Jiang
1be9f9af20
Merge pull request #4627 from wy65701436/fix-readonly-issue 
Log error when to write response body in readonly filter
 2018-04-11 17:15:58 +08:00
pfh
8e4de81dfc Fix issue about links text and i18n 2018-04-11 14:50:55 +08:00
wangyan
d005ff941f log error when to write response body in readonly filter 2018-04-10 23:17:30 -07:00
Deng, Qian
4788a9fe3a Add deploy and add additional info on action bar 2018-04-10 20:50:51 +08:00
pengpengshui
0d576fb19b
Merge pull request #4610 from pengpengshui/fixIssue 
Add bread crumb under project
 2018-04-10 17:27:54 +08:00
pfh
5b6fe1fccc add bread crumb under project 2018-04-10 16:04:15 +08:00
Wenkai Yin
352c45b3ff Fix log API random failure on travis 2018-04-10 15:30:24 +08:00
pengpengshui
3cf075d9bb
Merge pull request #4602 from pengpengshui/labelCase 
Label case
 2018-04-09 18:07:36 +08:00
pfh
c80e33fd73 Midify label color panel about #4580 2018-04-09 15:54:30 +08:00
Steven Zou
2b799a576b
Merge pull request #4595 from vmware/enable_auth_checking 
Apply auth checking to all the incoming requests
 2018-04-09 12:50:34 +08:00
Steven Zou
85ae40f5ec Apply auth checking to all the incoming requests 2018-04-08 18:12:13 +08:00
pengpengshui
d94699dca3
Merge pull request #4585 from pengpengshui/fixIssue 
Modify read only mode position, fix other issue
 2018-04-08 17:46:06 +08:00
Steven Zou
529ad3e079
Merge pull request #4593 from vmware/add_more_log_2_js 
Fix issue: failed to update the status of job if runtme error occurred
 2018-04-08 14:03:34 +08:00
Daniel Jiang
9474a9773e
Merge pull request #4592 from reasonerjt/secret-in-header 
Store secret in header instead of cookie
 2018-04-08 13:32:10 +08:00
Steven Zou
233692c127 fix issue: job context may be nil pointer when trying to be closed in defer func 2018-04-08 13:03:23 +08:00
Deng, Qian
109c6a28fb Abstract repo click as a output event 2018-04-08 11:00:37 +08:00
Steven Zou
1cb40368f5 Fix issue: failed to update the status of job if runtme error occurred 2018-04-08 10:38:47 +08:00
Tan Jiang
ff06ec05c3 Store secret in header instead of cookie 2018-04-07 22:02:06 +08:00
Daniel Jiang
b5f52bc3fb
Merge pull request #4586 from reasonerjt/job-context-props 
Read the system properties from scan job context
 2018-04-07 10:23:30 +08:00
Daniel Jiang
b0860c9da0
Merge pull request #4584 from ywk253100/180404_dep 
Update packages github.com/Sirupsen/logrus, github.com/gorilla/context and github.com/garyburd/redigo to new version
 2018-04-05 12:25:22 +08:00
Tan Jiang
15580a5e8c Read the system properties from scan job context 2018-04-04 19:58:54 +08:00
pfh
9c5cc58f41 Modify read only mode position, fix other issue 2018-04-04 17:09:10 +08:00
stone
df63a73fd4
Merge pull request #4483 from stonezdj/api4assign_role_to_group4 
Add REST API for assign role to group
 2018-04-04 16:19:37 +08:00
stonezdj
9bcfaedc0e Add REST API for assign role to group 2018-04-04 13:39:42 +08:00
Qian Deng
1296a09034
Merge pull request #4577 from ninjadq/reduce_properties_in_hbr_repository 
Reduce properties in hbr repository
 2018-04-04 10:47:55 +08:00
Deng, Qian
0e3edeb0a8 Reduce properties in <hbr-repositry> 2018-04-03 19:55:31 +08:00
Deng, Qian
46ec21ae80 Fix bug vulnerability notification not showing 2018-04-03 18:00:09 +08:00
Steven Zou
44808650be Merge branch 'master' into job_service 2018-04-03 16:28:26 +08:00
Wenkai Yin
79f0ca96bc
Merge pull request #4572 from ywk253100/180402_job 
Hide schedule job when listing replication jobs
 2018-04-03 16:12:10 +08:00
Wenkai Yin
46ec8c70fa Update packages github.com/Sirupsen/logrus, github.com/gorilla/context and github.com/garyburd/redigo to new version 2018-04-03 11:48:06 +08:00
pengpengshui
73e32d1735
Merge pull request #4562 from pengpengshui/label 
Modify label filter issue and add stick label to image case
 2018-04-03 09:39:05 +08:00
Wenkai Yin
500651a5a1 Hide schedule job when listing replication jobs 2018-04-03 01:11:55 +08:00
Daniel Jiang
3af2b0caa5
Merge pull request #4568 from reasonerjt/scan-job-migrate 
Scan job migrate
 2018-04-02 21:40:30 +08:00
Tan Jiang
7aec4d9f21 Add UT and remove useless code. 2018-04-02 21:28:46 +08:00
Steven Zou
6c69a8cd05 Fix issue of stopping periodic job 
improve op command by using cache
return 404 if no job found to stop
 2018-04-02 18:08:03 +08:00
pfh
e5a757d78d Modify label filter issue and add stick label to image case 2018-04-02 14:45:52 +08:00
pengpengshui
6a1af52949
Merge pull request #4542 from pengpengshui/tagdetail 
Add repo read only
 2018-04-02 13:41:46 +08:00
Steven Zou
fee7f6ddef Merge branch 'job_service' into switch_job_service 2018-04-02 12:06:23 +08:00
Steven Zou
35fe857b07 Fix nil pointer issue in replication/target 2018-04-02 11:12:20 +08:00
Wenkai Yin
3436729d52
Merge pull request #4547 from ywk253100/180328_schedule_replication_job 
Move schedule replication job to new jobservice
 2018-03-30 21:03:45 +08:00
Steven Zou
0dd595ca63 Merge job_service into switch_job_service and fix conflicts 2018-03-30 19:30:56 +08:00
Steven Zou
ba91fc2861 Merge master into job_service and fix conflicts 2018-03-30 19:26:04 +08:00
Wenkai Yin
dd40f187ec Move schedule replication job to new jobservice 2018-03-30 17:44:05 +08:00
Steven Zou
250360307b Modify docker compose file template and make file to enable new job service 
Fix typo in Makefile under photon

Fix version tag issue of redis container

Assign container name for redis container

Update docker compose template to enable network for redis

Remove exposed ports of redis from compose yaml tpl
 2018-03-30 16:52:55 +08:00
Yan
892d9bf023
bypass docker client retry on push in readonly mode (#4524) 2018-03-29 23:49:00 -07:00
Daniel Jiang
07d7d467e7
Merge pull request #4539 from reasonerjt/trust-admiral-cert 
Trust Root CA of VIC appliance when accessing Admiral
 2018-03-30 13:30:15 +08:00
pfh
a43451c7ea Add repo read only and modify label issue 2018-03-30 11:38:45 +08:00
Steven Zou
013028ef4a Replace old job service package with V2 (rename packages) 2018-03-30 11:22:29 +08:00
Steven Zou
bfbb949034 Use the new job service(v2) to replace the old one 2018-03-29 23:30:03 +08:00
Steven Zou
d1899c840d Merge branch 'master' into job_service 2018-03-29 23:25:20 +08:00
Tan Jiang
5dd75bb0b0 Trust Root CA of VIC appliance when accessing Admiral 2018-03-29 19:53:41 +08:00
Steven Zou
9889d4badd Add UT cases for package pool 2018-03-29 19:50:44 +08:00
Deng, Qian
74cbfcb926 Add cardview for harbor 2018-03-29 19:37:23 +08:00
Deng, Qian
557c68a57c Abstract repo click as a output event 2018-03-29 19:37:23 +08:00
Steven Zou
e454456de2 Merge branch 'job_service' into add_ut_period 2018-03-28 19:54:03 +08:00
Qian Deng
6ca2f39186
Merge pull request #4491 from danielefranceschi/master 
fix size suffix label for >1GB images
 2018-03-28 18:44:43 +08:00
Steven Zou
d7aa1dacf0 Add UT cases for package period 2018-03-28 17:35:57 +08:00
Daniel Jiang
2c2cbd9c52
Merge pull request #4510 from reasonerjt/master 
Add indexes to job tables and bump up schema version.
 2018-03-28 16:58:16 +08:00
Steven Zou
75f4f7e0a4
Merge pull request #4513 from vmware/steven_job_service 
Add UT cases for package opm (update travis yaml to start redis conta…
 2018-03-28 16:30:03 +08:00
Tan Jiang
b6df6cf169 Add indexes to job tables and bump up schema version. 2018-03-28 16:15:54 +08:00
Wenkai Yin
22e06c46e3
Merge pull request #4512 from ywk253100/180328_replication_hook 
Handle replication job status hook
 2018-03-28 16:10:51 +08:00
Steven Zou
33c3603af2 Add waiting time before triggering http request 2018-03-28 15:57:59 +08:00
Steven Zou
d3909bb633 Add UT cases for package opm (update travis yaml to start redis container) 
Fix data race issue in opm package
 2018-03-28 15:28:34 +08:00
Wenkai Yin
55035ada2d
Merge pull request #4490 from ywk253100/180326_label 
Delete the mapping relationship between resources and labels when the label is deleted
 2018-03-28 14:38:01 +08:00
Steven Zou
d183226570
Merge pull request #4507 from vmware/steven_job_service 
Fix the issue of causing config test failed
 2018-03-28 14:16:09 +08:00
Qian Deng
a12c213cd1
Merge pull request #4494 from pengpengshui/tagdetail 
Modify tag detail page and fix label bugs
 2018-03-28 14:10:01 +08:00
Steven Zou
ee2da73c71 Refactor the job stats manager (remove useless object references) 2018-03-28 12:51:55 +08:00
Steven Zou
3ce31586df Fix the issue of causing config test failed 2018-03-28 12:40:36 +08:00
Steven Zou
b943bed6e6 Refactor redis pool and job stats manager for clarifying functions 
also add UT cases for logger and part of opm package

Fix config test case issue
 2018-03-28 12:11:45 +08:00
Daniel Jiang
0918a0ac7e
Merge pull request #4504 from reasonerjt/scan-job-migrate 
Integrate with status hook of jobservice
 2018-03-28 09:50:49 +08:00
Tan Jiang
0abf53c112 fix golint 2018-03-27 21:30:37 +08:00
Tan Jiang
be97a91650 Integrate with jobservice webhook 2018-03-27 21:27:52 +08:00
wangyan
01487b8221 Add readonly into systeminfo 2018-03-27 04:29:20 -07:00
Steven Zou
02b73b50f2 Merge branch 'job_service' of https://github.com/vmware/harbor into job_service 2018-03-27 18:19:30 +08:00
Steven Zou
660d2610ba Add UT cases for api,core and config package 
do changes to enable interfaces
 2018-03-27 18:17:46 +08:00
pfh
22fa1ba189 Add control about label for admiral and standalone 2018-03-27 14:31:18 +08:00
pfh
42fa690f90 Modify tag detail page and fix label bugs 2018-03-27 10:12:37 +08:00
Tan Jiang
c859616e25 fix golint and go vet issue 2018-03-26 22:10:01 +08:00
Daniele Franceschi
71eeebec6f
fix rendering suffix for >1GB images 2018-03-26 14:48:13 +02:00
Tan Jiang
582deea9e7 resolve conflict 2018-03-26 18:11:39 +08:00
Tan Jiang
41ce0891ab Trigger scan job from UI. 2018-03-26 18:07:21 +08:00
Wenkai Yin
38568a1d2c
Merge pull request #4485 from ywk253100/180326_period_job 
Create a job to call UI's replication API to do the period replication job
 2018-03-26 17:31:10 +08:00
Steven Zou
e966698939 Extarct out redis pool initialization code to bootstrap 2018-03-26 16:38:53 +08:00
Tan Jiang
745b21abbc Merge remote-tracking branch 'upstream/master' into scan-job-migrate 2018-03-26 15:39:42 +08:00
Steven Zou
7663592551 Merge branch 'job_service' of https://github.com/vmware/harbor into job_service 2018-03-26 15:30:36 +08:00
Steven Zou
5e2543833b Replace log in commmon package to logger in logger package for loose couple 2018-03-26 15:30:16 +08:00
stone
203b1b52bb
Merge pull request #4415 from stonezdj/user_group_and_project_member 
Add DAO for user group and project member
 2018-03-26 15:21:20 +08:00
stonezdj
49d960b060 Add DAO for project member and user group 2018-03-26 14:38:32 +08:00
yixingj
cb64ad96ff Make endpoint configurable 
Move all the endpoint to harbor.cfg
 2018-03-26 10:50:18 +08:00
Tan Jiang
381ecc3521 Merge with master 2018-03-26 10:37:17 +08:00
Wenkai Yin
dd156ca243 Handle replication job status hook 2018-03-24 21:18:58 +08:00
Wenkai Yin
1fea594c3d Trigger replication job from UI with new jobservice 2018-03-24 18:10:50 +08:00
Steven Zou
ba85378ac3 Merge branch 'job_service' of https://github.com/vmware/harbor into job_service 2018-03-24 16:45:46 +08:00
Steven Zou
4cc9e0bf47 Close the open IO stream used by the job logger after job eixting 2018-03-24 16:45:26 +08:00
Wenkai Yin
85f357ec6b Delete the mapping relationship between resources and labels when the label is deleted 2018-03-24 02:22:51 +08:00
Wenkai Yin
e63d5a1c06 Create a job to call UI's replication API to do the period replication job 2018-03-23 23:53:15 +08:00
Wenkai Yin
837f46872a
Merge pull request #4463 from ywk253100/180313_replication_job 
Migrate replication job to the new jobservice
 2018-03-23 19:04:12 +08:00
Wenkai Yin
ed08a42e4b Migrate replication job to the new jobservice 2018-03-23 18:36:37 +08:00
Yan
cbcca015b0
add read only mode to stop docker push (#4433) 2018-03-23 03:16:08 -07:00
Steven Zou
75e29782f6 Implement job context for harbor jobs 
initialize DAO
get configurations from admin server
 2018-03-23 17:26:41 +08:00
Steven Zou
e160804be2 Fix nil job returned bug 2018-03-23 13:50:23 +08:00
pfh
71124d08dd Add label module 2018-03-23 09:58:06 +08:00
Steven Zou
49bb9bfceb Add logger sweeper to periodically clear outdated log files created by the jobs 2018-03-22 23:44:08 +08:00
Daniel Jiang
b4a4eb11c6
Merge pull request #4459 from ywk253100/180321_package_upgrade 
Upgrade packages used by Harbor
 2018-03-22 19:03:10 +08:00
Steven Zou
579b70c5e4 Inject logger into the execution context of running job for logging 
define logger interface
implement a logger base on common log package
add getting log API
inject logger to the job execution context
 2018-03-22 18:29:39 +08:00
Steven Zou
b001180d26 Merge branch 'job_service' of https://github.com/vmware/harbor into job_service 2018-03-22 13:43:12 +08:00
Steven Zou
e5f8beb35f Support status hook mechanism to report job status changes 
refactor scheduler to extarct separate sub/pub system
fix bug in getJob
return all the stats data of running pools in the health check API
 2018-03-22 13:41:00 +08:00
Wenkai Yin
c6e65d2ded Fuzzy matching repository name in GET repositories API 2018-03-22 13:38:26 +08:00
Wenkai Yin
0b7d4af4c1 Upgrade packages used by Harbor 2018-03-22 13:10:49 +08:00
Tan Jiang
b8ec419c8e Add missed package to fix compilation issue 2018-03-21 16:59:32 +08:00
Tan Jiang
483496ed93 remove swp file 2018-03-21 16:32:21 +08:00
Tan Jiang
613464bc16 Migrate scan job to job service V1 phase1 2018-03-21 16:25:32 +08:00
Tan Jiang
6303785b1b Merge branch 'job_service' of https://github.com/vmware/harbor into scan-job-migrate 2018-03-21 13:06:40 +08:00
Yan
5edbd00318
Revise harbor build version (#4445) 2018-03-21 13:03:49 +08:00
Wenkai Yin
838b439560 Implement filter repository and tags by label API 2018-03-21 10:51:06 +08:00
Wenkai Yin
a7a72f78bd Return role and repository count info in GET project API 2018-03-20 19:09:06 +08:00
Steven Zou
ac544b3ead Support job related operational actions 
support stop job
support cancel running generic job
support retry failed job
support checkin details progress of job
 2018-03-20 18:03:04 +08:00
Tan Jiang
00825d3ca4 Merge branch 'job_service' of https://github.com/vmware/harbor into scan-job-migrate 2018-03-20 17:37:27 +08:00
Steven Zou
fbc24d85db Support job operation actions like stop/cancel 2018-03-16 19:38:51 +08:00
Tan Jiang
b1d1e039dc Merge branch 'job_service' of https://github.com/vmware/harbor into scan-job-migrate 2018-03-16 15:30:53 +08:00
Daniel Jiang
cbedf099b5
Merge pull request #4342 from yixingjia/apimonitor 
Add monitor API for Harbor components
 2018-03-16 14:56:58 +08:00
Steven Zou
2f97970484 Support update job status for both generic and periodic job 
refactor scheduler
refactor period.enqueuer
add stats manager component
 2018-03-15 20:23:42 +08:00
Steven Zou
be75145858 Implement API service of getting job stats 2018-03-15 14:33:57 +08:00
Steven Zou
ea912729ec fix golint issues in code 2018-03-15 12:31:54 +08:00
Steven Zou
4b4e0ddfff Refactor job programming model 
refine job context
remove setXXX injection methods in job.Interface
use parameters of Run to pass context and parameters
 2018-03-15 12:26:01 +08:00
yixingj
4255ed167a Add monitor API for Harbor components. 
1>AdminServer.
2>UI.
 2018-03-15 10:39:55 +08:00
Steven Zou
28d02931d2 Support saving job stats to the baclend for the redis workerpool 2018-03-15 09:56:07 +08:00
stonezdj
44fc373c6d Add LDAP Group Search Configure Param 2018-03-15 06:16:47 +08:00
Steven Zou
b61dc39278 Refactor the job execution context interface 2018-03-14 19:17:38 +08:00
Steven Zou
5f5fb5b6ec Refine the context related things 
change job context to interface
move job conetxt to the env package
move the concrete job implementation to separate folder
 2018-03-14 18:24:53 +08:00
Steven Zou
414c36205c Support API service of checking stats of the worker pool 2018-03-14 16:59:00 +08:00
Steven Zou
6b46844565 Add sweeper to clear the outdated data before the workerpool is starting 2018-03-14 15:52:00 +08:00
Daniel Jiang
0efd8e3c54
Merge pull request #4396 from ywk253100/180309_label_resource 
Implement adding/removing labels to/from repositories and images API
 2018-03-14 14:15:31 +08:00
Wenkai Yin
bcf81224ad Update according to the comments 2018-03-14 13:42:19 +08:00
Steven Zou
7b8971e930 Implement periodically enqueue job feature 
add scheduler based on redis
add job wrapper for redis driver
other necessary modules
 2018-03-13 23:58:07 +08:00
Wenkai Yin
36b9c4e458 Implement adding/removing labels to/from repositories and images API 2018-03-12 19:30:05 +08:00
Tan Jiang
b81b55b0c1 Extend the length of project name in request validation 2018-03-12 16:07:06 +08:00
yixingjia
ac05806dec Reload the attributes of Harbor db and Clair db when restart Harbor. (#4349) 2018-03-12 15:40:45 +08:00
Wenkai Yin
379f113452 Implement label management API 2018-03-09 12:17:27 +08:00
Wenkai Yin
685140cda8
Merge pull request #4375 from ywk253100/180308_smtp_tls 
Do the authentication with CRAM-MD5 when the connection is insecure
 2018-03-08 17:42:18 +08:00
pfh
e017f63103 Modify pagenation in Use, project name exist issue #4350 #4205 #4177 2018-03-08 16:25:24 +08:00
Wenkai Yin
0a8929b85e Do the authentication with CRAM-MD5 when the connection is insecure 2018-03-08 14:21:44 +08:00
Steven Zou
7a3c35d178 Implement the base framework of job service V2 
add API server
add redis worker pool
add configuration loader
add bootstrap process
add vendor via dep
 2018-03-08 13:16:57 +08:00
pfh
805e4aa4db Modify fileter problem and input length #4185 #4264 2018-03-07 17:01:00 +08:00
pfh
b2fb33ba0d Modify replication rule from page to dialog #4296 2018-03-07 10:03:08 +08:00
Tan Jiang
2f2bc7f3ef add ut 2018-03-01 18:52:09 +08:00
Tan Jiang
3a5bff1615 Refine error returned by Authenticator 
There has been inconsistency in terms of the error returned by
authenticator.
This commit introduces an error ErrAuth to explicitly flag an
authentication failure, which should be treated as user error such
as "invalid credentials", and other errors will be treated as system error.
 2018-03-01 18:19:46 +08:00
Tan Jiang
fc4e427c41 Return zero instead of error if the volume directory is not found at admin server 2018-02-28 13:52:33 +08:00
Daniel Jiang
ef54647749
Merge pull request #4230 from stonezdj/project_member_refactor2 
Refactor project member
 2018-02-27 14:33:26 +08:00
patfrat
3159e2c514 Add French ui_ng translation 2018-02-26 14:53:59 +01:00
stonezdj
4c6d1488bd Add UT 2018-02-09 15:29:08 +08:00
stonezdj
f138067242 Refactor project member 2018-02-09 10:38:51 +08:00
Daniel Jiang
bd12a3f958
Merge pull request #4235 from ywk253100/180206_godep 
Specify the versions of packages used in golang dep
 2018-02-08 12:38:02 +08:00
Qian Deng
83ec190dbf
Merge pull request #4229 from ninjadq/fix_ui_test_case 
Fix UI that break test case
 2018-02-06 19:19:50 +08:00
Wenkai Yin
4e6800745b Specify the versions of packages used in golang dep 2018-02-06 18:49:40 +08:00
Deng, Qian
207ce035e1 Fix UI that break test case 2018-02-06 10:52:53 +08:00
Tan Jiang
40b6cb0d43 Return UAA error to Security Context layer 2018-02-05 21:00:19 +08:00
Daniel Jiang
87ca267b0f
Merge pull request #4221 from ywk253100/180131_beego_1.9.2 
Upgrade beego 1.6.1 to 1.9.0
 2018-02-05 19:17:44 +08:00
Wenkai Yin
10f56d26fe Change codes to make everything OK after upgrading to beego 1.9.0 2018-02-05 13:07:52 +08:00
Wenkai Yin
e7b431899e Upgrade beego from 1.6.1 to 1.9.0 2018-02-05 13:07:52 +08:00
Qian Deng
3b36236dc0
Merge pull request #4206 from ninjadq/open_add_member_modal_too_long 
Fix bug open add member modal time too long
 2018-02-01 14:57:47 +08:00
Wenkai Yin
58a3c590bd
Merge pull request #4207 from ywk253100/180131_beego_1.9.2 
Ignore packages under tests in go dep
 2018-02-01 13:51:48 +08:00
Wenkai Yin
ca92475fc2 Ignore packages under tests in go dep 2018-02-01 13:21:52 +08:00
Deng, Qian
26d6a04257 Fix bug open add member modal time too long 2018-02-01 12:57:40 +08:00
pfh
30a64b1923 Modify endpoint button name unsame with others issue 2018-01-31 16:43:22 +08:00
Deng, Qian
32793e2859 Add force refresh to new user form 2018-01-31 10:43:12 +08:00
Qian Deng
11288ccc0c
Merge pull request #4187 from ninjadq/leaving_repo_dialog 
Fix open confirmation dialog when leving repo
 2018-01-30 19:33:34 +08:00
pfh
09c1c39cd3 delete username and pwd in replication rule 2018-01-30 18:47:27 +08:00
Deng, Qian
f14bab1976 Fix open confirmation dialog when leving repo 2018-01-30 17:51:15 +08:00
pfh
715a49834b Merge remote-tracking branch 'upstream/master' into batchDelection 2018-01-30 13:22:06 +08:00
Qian Deng
ef1ed75ac9
Merge pull request #4175 from ninjadq/only_db_can_create_delete_user 
Enhance Create && Delete button should diabled if not db auth
 2018-01-30 13:13:05 +08:00
pfh
84c9a409ed Stop bubbling event in replication list 2018-01-30 11:53:53 +08:00
pfh
5e14601d2e Merge remote-tracking branch 'upstream/master' into batchDelection 2018-01-30 11:45:26 +08:00
pfh
008cf32bb3 Modify users about delete myself display issue #4164 2018-01-30 10:55:11 +08:00
Deng, Qian
b31a91b64a Fix UI bugs 
Add deleting confirmation dialog back
Change buttons' style on tag component
 2018-01-29 21:54:59 +08:00
Deng, Qian
afc56b0645 Enhance Create && Delete button should diabled if not db auth 2018-01-29 21:38:53 +08:00
Qian Deng
02554204e4
Merge pull request #4139 from ninjadq/fix_description_too_long 
Fix description too long
 2018-01-29 21:27:28 +08:00
pfh
63dcb27d08 Modify replication list unsave when modify username or pwd 2018-01-29 17:38:49 +08:00
Wenkai Yin
9022abfc13 Fix code issues found by Gas 2018-01-29 15:17:03 +08:00
Deng, Qian
8f1fa387c2 Fix admin rename tooltip 2018-01-29 10:33:03 +08:00
Deng, Qian
86dac8bbb9 Fix relication description too long to display 2018-01-26 18:10:39 +08:00
pfh
cc894a39bf Modify create endpoint ping icon undisappear auto about #4102 2018-01-26 15:44:10 +08:00
pfh
1dc6e57ffd Modify issue about endpoint delection unfreash page 2018-01-26 15:03:29 +08:00
pfh
791004c1b5 Add username adn pwd for target and unselected project name and target first time 2018-01-26 12:11:16 +08:00
Deng, Qian
d536c64566 Update test cases for UI changes 2018-01-25 20:36:03 +08:00
Deng, Qian
a1c850cfdb Display storage statistic only in filesystem mode 2018-01-25 20:36:03 +08:00
Deng, Qian
4a21f80b86 Add icon to buttons && change button group to buttons 2018-01-25 20:36:03 +08:00
Deng, Qian
bec2780576 Remove Confirmation on some simple batch actions 2018-01-25 20:36:02 +08:00
Deng, Qian
9a87c8b663 Fix bug tag size became exact number after reload data 2018-01-25 20:36:02 +08:00
Deng, Qian
08fd136c3c Enhance admin rename Logout after admin rename 2018-01-25 20:36:02 +08:00
Daniel Jiang
2519601d9f
Merge pull request #4121 from reasonerjt/add-go-redsync-vendor 
Include go-redsync v1.0.1 in vendor
 2018-01-25 17:58:15 +08:00
Daniel Jiang
5e5c0d4556
Merge pull request #4118 from reasonerjt/master 
Fix Nil pointer issue in login function
 2018-01-24 18:29:41 +08:00
Tan Jiang
ea38b7eefe Include go-redsync v1.0.1 in vendor 2018-01-24 15:30:20 +08:00
Tan Jiang
e9b656ce79 Fix Nil pointer issue in login function 2018-01-24 14:49:03 +08:00
pfh
5d35bed4d7 set replication list as single selection about #4107 2018-01-23 19:31:53 +08:00
pfh
f34ac6aa2b Modify package version 2018-01-23 14:47:33 +08:00
pfh
db670a2b09 Merge remote-tracking branch 'upstream/master' into batchDelection 2018-01-23 14:40:48 +08:00
Wenkai Yin
785fc57147
Merge pull request #4097 from ywk253100/180122_config_api 
Convert struct to json string when storing it to database as a configuration item
 2018-01-23 11:03:44 +08:00
Wenkai Yin
0165fcc82b Convert struct to json string when storing it to database as a configuration item 2018-01-22 20:01:28 +08:00
Qian Deng
bdb9d13590
Merge pull request #4072 from ninjadq/bugx_fix 
Bugs fix
 2018-01-22 17:56:02 +08:00
Tan Jiang
7ab1a2367a Update testify in vendor folder to v1.2.0 2018-01-21 21:52:46 +08:00
Fuhui Peng (c)
7d7620593d Modify create multiple replication rules with same name 2018-01-19 17:44:21 +08:00
Deng, Qian
e240290bc7 Merge branch 'master' into bugx_fix 2018-01-19 15:43:14 +08:00
Qian Deng
71baf937ea
Merge pull request #4057 from ninjadq/enhance_uaa_config 
Fix UAA edit password bug
 2018-01-19 15:34:43 +08:00
Wenkai Yin
515cac010a
Merge pull request #4071 from ywk253100/180117_policy_pagination 
Add pagination support in listing replication policy API
 2018-01-19 15:19:45 +08:00
stonezdj
b99a13cfa8 Fix bug 4073 2018-01-19 11:46:24 +08:00
Deng, Qian
86454d3e88 Fix project Name length issue 
Extend the length of project name to 255
 2018-01-18 18:51:16 +08:00
Wenkai Yin
69fa18c881
Merge pull request #4059 from ywk253100/180117_job_status 
Support multiple status in query string of replication job listing API
 2018-01-18 18:05:08 +08:00
Deng, Qian
873d537b17 Fix bug pull command not display regisrty ip or hostname 2018-01-18 17:58:17 +08:00
Deng, Qian
ea6fcd2aa1 Fix UAA edit password bug 
Fix UAA edit password bug
Fix password edit bug
Remove unused code
Fix some tslint issue
 2018-01-18 16:23:49 +08:00
Wenkai Yin
611709a7be Add pagination support in listing replication policy API 2018-01-18 15:54:12 +08:00
Fuhui Peng (c)
5b921d59aa Modify package.json 2018-01-18 15:08:45 +08:00
Fuhui Peng (c)
29e53817b9 Merge remote-tracking branch 'upstream/master' into batchDelection 2018-01-18 14:59:32 +08:00
Qian Deng
8f855ffc4e
Merge pull request #4037 from ninjadq/admin_rename_ui 
add admin rename ui
 2018-01-18 14:53:17 +08:00
Daniel Jiang
440f5e6364
Merge pull request #4039 from stonezdj/ldap_migrate_scope 
Add update ldapScope for migrate
 2018-01-18 14:12:06 +08:00
stone
c815dc01dd
Merge pull request #4043 from reasonerjt/uaa-bugfix 
Read Email from UAA while onboarding user.
 2018-01-18 14:04:35 +08:00
Deng, Qian
b884be3e72 Add admin rename ui Add UI Element for rename admin 2018-01-18 13:49:13 +08:00
Qian Deng
b61e0ec867
Merge pull request #3953 from ninjadq/fix_text_bugs 
Fix bugs about i18n & text
 2018-01-18 13:19:02 +08:00
pfh
757a99bc6e Add add endpoint button in replication rule 
Modify stop job button privilege

Modify dispay issue about replication rule
 2018-01-17 19:46:07 +08:00
Deng, Qian
ac34c2c1da Fix bugs about i18n & text 2018-01-17 17:24:07 +08:00
Wenkai Yin
9ec8b4d634 Support multiple status in query string of replication job listing API 2018-01-17 17:07:10 +08:00
stonezdj
01ba4e1ea8 Add update ldapScope for migrate 2018-01-17 14:01:57 +08:00
Tan Jiang
d5d913f51d Read Email from UAA while onboarding user. 
Will call the userinfo API of UAA to get user info and generage user
model based on the response.  Also this commit include a change that
whenever the UAA Client is to be used it will update the configuraiton,
this is needed as we enable user to update the configuration of UAA via
UI.
 2018-01-17 10:28:49 +08:00
Wenkai Yin
7ebcc82516 Fix bug: checking whether the status is null when listing replication jobs 2018-01-16 19:25:18 +08:00
Wenkai Yin
8cda2d8d65
Merge pull request #4036 from ywk253100/180116_s3 
Propagate registry storage driver name to adminserver and return it in /api/systeminfo
 2018-01-16 18:41:08 +08:00
pengpengshui
7537d0ff10
Merge pull request #4010 from pengpengshui/batchDelection 
Modify replication list to batch delection mode
 2018-01-16 17:59:20 +08:00
Qian Deng
5017670d00
Merge pull request #4005 from ninjadq/db_migrate_from_1_3_to_1_4 
Update migration tool for v1.4
 2018-01-16 17:04:54 +08:00
Wenkai Yin
53d5a2256a Propagate registry storage driver name to adminserver and return it in /api/systeminfo 2018-01-16 16:57:28 +08:00
pfh
78dcdc409f Modify replication list to batch delection mode and add admin privilege to project replication module 
Modity text about new replication rule
 2018-01-16 15:53:11 +08:00
Deng, Qian
b3e65ed71e Update migration tool for v1.4 
1. Update database meta file
2. Add migration file for 1.4
 2018-01-16 15:38:51 +08:00
Wenkai Yin
e1a5958258
Merge pull request #4013 from ywk253100/180112_property_name 
Update the value of trigger type and schedule type
 2018-01-16 13:26:33 +08:00
Daniel Jiang
a9fe5564df
Merge pull request #4011 from ywk253100/180112_fix_404 
Handle /harbor/* with IndexController to fix UI 404 Page Not Found error
 2018-01-15 17:10:43 +08:00
Wenkai Yin
a1dd8c3bff
Merge pull request #4004 from ywk253100/180111_jobservice 
Provide a mechanism to stop pending and retrying jobs
 2018-01-15 12:55:44 +08:00
Tan Jiang
bc1366c3e5 Enable user to edit UAA settings on UI 2018-01-14 11:47:45 +08:00
Wenkai Yin
af8dbff4ce Update the value of trigger type and schedule type 2018-01-12 16:19:41 +08:00
Tan Jiang
d6bf0ea11d Remove data generated by dao_test after the test. 2018-01-12 15:56:30 +08:00
Wenkai Yin
27b4197459 Handle /harbor/* with IndexController to fix UI 404 Page Not Found error 2018-01-12 15:48:42 +08:00
Wenkai Yin
4070ed5152 Provide a mechanism to stop pending and retrying jobs 2018-01-12 15:29:20 +08:00
Daniel Jiang
43afd426bb
Merge pull request #3995 from reasonerjt/admin-rename 
Provide API to rename admin
 2018-01-12 13:59:13 +08:00
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