Commit Graph

3291 Commits

Author SHA1 Message Date
Tan Jiang
72b3a020e3 provide default timestamp for all distros in system info api 2017-07-13 18:48:05 +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
0ade32eef5 Merge pull request #2705 from steven-zou/master
Implement policy scheduler
2017-07-11 16:21:25 +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
Yan
7040e5ad5a Clair photon (#2721)
* update

* update

* modify docker compose

* update tag

* update
2017-07-10 21:00:44 -07: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
Daniel Jiang
e40fdc1719 Merge pull request #2729 from reasonerjt/scan_overview_id
add int id for scan overview and revoke the change in beego
2017-07-09 18:19:04 +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
Wenkai Yin
186538010d Merge pull request #2717 from ywk253100/170706_integration
Update auth context as Admiral's API changed
2017-07-07 11:03:13 +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
Yan
c0f1e7f419 Merge pull request #2714 from wy65701436/DB-update
update user realname
2017-07-06 00:26:20 -07: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
yixingjia
326b65ef23 Merge pull request #2700 from yixingjia/upgradeclair
Update Clair to 2.0.1
2017-07-06 11:02:56 +08:00