Commit Graph

251 Commits

Author SHA1 Message Date
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
Tan Jiang
771e26a188 fix bug 2017-07-14 14:53:12 +08:00
Tan Jiang
72b3a020e3 provide default timestamp for all distros in system info api 2017-07-13 18:48:05 +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
Wenkai Yin
005d783463 Merge pull request #2732 from ywk253100/170710_bug_fix
Bug fix
2017-07-12 12:59:24 +08:00
Tan Jiang
543cf62e14 read last update from clair db, return in system info 2017-07-11 21:26:31 +08:00
Wenkai Yin
52f9e5f1c8 disable some APIs in integration mode 2017-07-11 18:13:48 +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
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
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
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
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
Steven Zou
82e17fade1 refine scheduler according to review comments 2017-07-05 19:13:49 +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
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
Wenkai Yin
94507fc8a1 fix bugs found in test 2017-07-04 17:18:24 +08:00
Wenkai Yin
aac742e8ba update 2017-07-04 12:33:11 +08:00
Wenkai Yin
3ebe1a824b update codes of auth context 2017-07-03 13:37:55 +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
af0e8c85bb configuration api can handle scan all policy 2017-06-29 15:14:11 +08:00
Wenkai Yin
f806adaac4 update test cases of PMS project manager 2017-06-28 15:44:40 +08:00
Wenkai Yin
ab65bca2fe Merge pull request #2649 from ywk253100/170627_service_account
Implement GetByMember function in PMS project manager
2017-06-28 15:25:21 +08:00
Wenkai Yin
4770aeba90 provide a method to get token from token service 2017-06-28 12:23:14 +08:00
Tan Jiang
00e86d86b6 provide an API to scan all images, and some refactory 2017-06-27 19:25:11 +08:00
Wenkai Yin
016af6bc78 implement GetByMember function in PMS project manager 2017-06-27 18:44:20 +08:00
Daniel Jiang
34871fe202 Merge pull request #2627 from reasonerjt/clair-integration
small refinement to clair client
2017-06-26 14:34:08 +08:00
Wenkai Yin
c50e2a5606 Merge pull request #2607 from ywk253100/170622_project
Fix bug: can't show the role of member
2017-06-26 10:17:36 +08:00
Tan Jiang
ed296812f0 small refinement to clair client 2017-06-25 11:44:56 +08:00
Wenkai Yin
b960565d11 Merge remote-tracking branch 'upstream/master' into 170621_auth
Conflicts:
	src/ui/filter/security.go
2017-06-23 18:49:08 +08:00
Wenkai Yin
94822746f1 implement admiral login 2017-06-23 18:17:45 +08:00
Wenkai Yin
419cf8dfc3 fix bug: can't show the role of member 2017-06-23 17:23:00 +08:00
Wenkai Yin
0b55ce6e80 add GetAll support in PMS project manager 2017-06-23 16:53:59 +08:00
Wenkai Yin
4fe5881121 bug fix 2017-06-21 19:24:29 +08:00
Yan
38b09f9f3f Merge pull request #2579 from ywk253100/170620_pm
Using project manager instead of DAO project methods
2017-06-20 05:40:55 -07:00
Wenkai Yin
d0eec5bb0d Merge pull request #2558 from ywk253100/170618_auth
Add security context based on admiral
2017-06-20 17:18:28 +08:00
Wenkai Yin
de2479edee update 2017-06-20 13:49:41 +08:00
Wenkai Yin
0aed9a1171 use project manager instead of dao method 2017-06-20 13:19:43 +08:00
Tan Jiang
a1a08ebed0 provide API to get vulnerability details 2017-06-20 12:10:55 +08:00
Wenkai Yin
8191f4a476 add security context based on admiral 2017-06-18 22:19:12 +08:00
Wenkai Yin
482f91d91a Merge pull request #2547 from ywk253100/170616_user
Bug fix
2017-06-16 18:12:21 +08:00
Wenkai Yin
df56010739 bug fix 2017-06-16 17:23:22 +08:00
Wenkai Yin
9fb0ad6c0d Merge pull request #2543 from reasonerjt/clair-integration
provide POST api/repostitores/xxx/tags/xxx/scan to trigger image scan
2017-06-16 17:04:34 +08:00
Wenkai Yin
b8d17eeb79 replace trimleft with trimprefix 2017-06-16 16:30:40 +08:00
Tan Jiang
41346fe8c0 provide POST api/repostitores/xxx/tags/xxx/scan to trigger image scan 2017-06-15 20:23:55 +08:00
Tan Jiang
15384317e0 add with_clair flag in systeminfo 2017-06-15 16:15:46 +08:00
Daniel Jiang
6a85012dbd Merge pull request #2525 from reasonerjt/clair-integration
GET tags api includes scan overview
2017-06-15 15:34:05 +08:00
Wenkai Yin
7d595c10c5 Merge pull request #2485 from ywk253100/170608_project
Refactor GET /projects API
2017-06-14 21:03:28 +08:00
Tan Jiang
f016dd113c GET tags api includes scan overview 2017-06-14 21:02:59 +08:00
Wenkai Yin
d6c084485b Merge pull request #2497 from ywk253100/170612_user
Support pagination in GET /users API
2017-06-14 20:49:59 +08:00
Wenkai Yin
aecfcef51a Merge remote-tracking branch 'upstream/master' into 170608_project 2017-06-14 20:46:23 +08:00
Wenkai Yin
421e9b114e update 2017-06-14 20:35:51 +08:00
Wenkai Yin
802a2fbcce update 2017-06-14 20:23:29 +08:00
Tan Jiang
8590c8d6bb remove orm debug setting from test case 2017-06-14 16:11:23 +08:00
Tan Jiang
ae2d868fd4 handlers for image scan, store results overview in DB 2017-06-13 23:37:54 +08:00
Wenkai Yin
f0c47b990b Merge pull request #2495 from ywk253100/170605_pm
Implement project manager based on PMS
2017-06-13 15:46:48 +08:00
Wenkai Yin
5a25445096 update according to the comments 2017-06-13 15:28:48 +08:00
Wenkai Yin
539c0375a1 support pagination 2017-06-12 18:36:10 +08:00
Wenkai Yin
0925fd35f1 implement project manager based on PMS 2017-06-12 14:43:26 +08:00
Wenkai Yin
20cf8de0f7 Merge remote-tracking branch 'upstream/master' into 170608_project 2017-06-09 16:41:13 +08:00
Wenkai Yin
e97d7dab85 refactor GET /projects 2017-06-09 16:41:02 +08:00
Tan Jiang
58c4993974 add handlers in statemachine 2017-06-09 14:55:15 +08:00
Wenkai Yin
f700b1bfc6 Merge pull request #2461 from ywk253100/170607_log_api
Support query logs according to different conditions
2017-06-09 11:08:08 +08:00
Daniel Jiang
42984fe1c9 refactory for scan job service (#2459)
* refactory for scan job service and implement ScanJob.
2017-06-08 15:04:23 +08:00
Wenkai Yin
b2380818fd support query logs according to conditions 2017-06-08 14:44:08 +08:00
Wenkai Yin
9c4adbe8c9 Merge remote-tracking branch 'upstream/master' into 170525_log_pagination
Conflicts:
	src/common/security/rbac/context_test.go
	src/ui/api/statistic.go
	src/ui/projectmanager/pm.go
2017-06-05 16:53:15 +08:00
Yan
d00aba8de8 Merge pull request #2367 from ywk253100/170524_search
Refactor search API
2017-06-04 22:41:55 -07:00
Yan
158d14f559 Merge pull request #2358 from ywk253100/170523_replica
Refactor policy, job, target API
2017-06-04 20:29:05 -07:00
Wenkai Yin
1b83c0b076 support pagination in GET recent logs API 2017-05-26 17:51:20 +08:00
Wenkai Yin
cf306ec66e refactor statistics API 2017-05-24 16:34:33 +08:00
Wenkai Yin
97972028e1 refactor search API 2017-05-24 13:33:46 +08:00
Wenkai Yin
33e2e87b62 refactor system info API 2017-05-23 18:40:09 +08:00
Wenkai Yin
92dcf4bfd3 refactor policy, job, target API 2017-05-23 16:57:25 +08:00
Daniel Jiang
1c441b17be refactor job service (#2348) 2017-05-22 22:33:20 -07:00
Wenkai Yin
7df2be19de update 2017-05-19 13:24:31 +08:00
Wenkai Yin
b5279ea1f1 update 2017-05-17 17:54:10 +08:00
Wenkai Yin
e1c1b8ec34 refactor project api 2017-05-16 15:02:37 +08:00
Wenkai Yin
e28ad39430 Merge pull request #2290 from ywk253100/170511_merge
Refactor auth of token service
2017-05-12 16:42:23 +08:00
Wenkai Yin
7e805b2dd4 refactor auth of token service 2017-05-12 16:27:13 +08:00
Daniel Jiang
5892ef29c2 Merge pull request #2291 from reasonerjt/vulscan-job-refactory
add scan job table and dao functions
2017-05-12 02:45:55 -04:00
Tan Jiang
7d7d0c48f4 fix golin, add update status 2017-05-11 23:47:12 +08:00
Tan Jiang
dcbfb4d309 add scan job table and dao functions 2017-05-11 21:41:57 +08:00
Wenkai Yin
06ba7e0de0 update 2017-05-11 12:34:14 +08:00
Wenkai Yin
8f396b44f3 Merge remote-tracking branch 'upstream/master' into 170509_repo_api
Conflicts:
	src/ui/api/repository.go
2017-05-10 15:53:24 +08:00
Wenkai Yin
b02bbc0adf refactor repository API 2017-05-10 15:43:45 +08:00