Commit Graph

973 Commits

Author SHA1 Message Date
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
Tan Jiang
b84c7c25f1 return the status only when deployed with Clair 2017-07-07 19:04:00 +08:00
Wenkai Yin
d668730ffa return real status code returned by admiral APIs 2017-07-07 18:40:57 +08:00
Tan Jiang
ca805759d9 update scan overview in notification handler, and return clair vuln timestamp in system info 2017-07-07 17:47:52 +08:00
Steven Zou
cadc1187c2 Merge remote-tracking branch 'upstream/master' 2017-07-07 00:39:29 +08:00
Steven Zou
44be165edf Enable policy scheduler in ui main 2017-07-07 00:38:38 +08:00
Wenkai Yin
f7412b0c31 update auth context as Admiral's API changed 2017-07-06 18:32:22 +08:00
Wenkai Yin
315ca51611 Merge pull request #2675 from ywk253100/170630_tags
Just return tag list rather than 500 if there are errors when getting signatures or scan overview
2017-07-06 15:07:20 +08:00
Wenkai Yin
7b39a46c98 update 2017-07-06 14:48:43 +08:00
Wenkai Yin
cbaf24fe81 Merge pull request #2713 from ywk253100/170704_pm
Move some method of project manager to security context
2017-07-06 14:29:21 +08:00
Daniel Jiang
b96770b90a Merge pull request #2693 from reasonerjt/clair-notification
Clair notification handler
2017-07-05 20:18:34 +08:00
Steven Zou
82e17fade1 refine scheduler according to review comments 2017-07-05 19:13:49 +08:00
Yan
d849c36e3f Merge pull request #2570 from samifruit514/master
Allow 255 chars for Realname
2017-07-05 03:17:57 -07:00
Steven Zou
4b2bae4558 Merge branch 'master' of https://github.com/steven-zou/harbor 2017-07-05 17:57:31 +08:00
Steven Zou
5a5eb1d377 Update commnets of exported methods and structs 2017-07-05 17:57:20 +08:00
Wenkai Yin
b866200e4f Move some method of project manager to security context 2017-07-05 17:41:58 +08:00
Steven Zou
a477cb1a3e Merge branch 'master' of github.com:steven-zou/harbor 2017-07-05 17:04:43 +08:00
Steven Zou
c3dd5e6d12 Enhancements to configuration sharable component 2017-07-05 16:10:47 +08:00
Tan Jiang
8b31715b34 provide Clair notification handler
update the timestamp in DB, when handling the notification
2017-07-05 15:35:53 +08:00
Steven Zou
2bc557b559 Implement policy scheduler 2017-07-05 02:41:52 +08:00
root
f2d02848db change tag retrive's timeout 2017-07-04 10:03:38 +00:00
Wenkai Yin
b51b3ea5ac Merge pull request #2699 from ywk253100/170704_integration
Fix bugs found in test
2017-07-04 17:42:43 +08:00
Wenkai Yin
94507fc8a1 fix bugs found in test 2017-07-04 17:18:24 +08:00
Steven Zou
5cfe6540b7 Merge pull request #2670 from steven-zou/master
Implement scan all policy configuration
2017-07-04 16:53:50 +08:00
Wenkai Yin
aac742e8ba update 2017-07-04 12:33:11 +08:00
Steven Zou
f50a125d61 fix spec failure issue 2017-07-03 18:46:35 +08:00
Wenkai Yin
d2eb8fc8b6 filter request for basic auth in integration mode 2017-07-03 17:58:36 +08:00
Wenkai Yin
3ebe1a824b update codes of auth context 2017-07-03 13:37:55 +08:00
Wenkai Yin
2818c047bf Merge pull request #2672 from ywk253100/170628_getpm
Create a global project manager
2017-06-30 16:38:29 +08:00
Wenkai Yin
bdbdb383ac update 2017-06-30 16:21:55 +08:00
Wenkai Yin
2ada2dbd16 Merge pull request #2631 from ywk253100/170626_statistic
Refactor statistics API to return private/public count of projects and repositories
2017-06-30 14:26:15 +08:00
Wenkai Yin
99a492270e just return tag list rather than 500 error if there are errors 2017-06-30 13:40:25 +08:00
Wenkai Yin
84b443e2b2 Merge remote-tracking branch 'upstream/master' into 170628_getpm
Conflicts:
	src/ui/config/config.go
	src/ui/proxy/interceptor_test.go
2017-06-30 00:14:45 +08:00
Wenkai Yin
d6b4330cc8 create a global project manager 2017-06-30 00:08:45 +08:00
Steven Zou
1db36d99fb Implement scan all policy configuration 2017-06-29 18:41:30 +08:00
Daniel Jiang
ea827ffd6e Merge pull request #2658 from ywk253100/170627_registry
Provide a method to get token from token service
2017-06-29 17:56:38 +08:00
Tan Jiang
9ac23d9da5 add the attribute to valid keys 2017-06-29 16:06:48 +08:00
Tan Jiang
af0e8c85bb configuration api can handle scan all policy 2017-06-29 15:14:11 +08:00
Yan
159d549dbd Merge pull request #2581 from wy65701436/vul-interceptor
vulnerable interceptor
2017-06-28 22:10:10 -07:00
wangyan
c6a8e4076b to get travis status 2017-06-28 21:20:44 -07:00