Граф коммитов

207 Коммитов

Автор SHA1 Сообщение Дата
Phrozyn fb7bc08424
removing erroneous WatchList list instantiation, changing db reference to watchentries. 2019-01-08 12:48:03 -06:00
Phrozyn 69a01500c5
A few tweaks in regards to previous suggestions and advice. 2019-01-07 19:34:37 -06:00
Phrozyn 58cf3a9fbe
Final PEP8 Fix to match master 2018-12-17 17:46:03 -06:00
Phrozyn 7435c6e6ac
Merge branch 'master' of https://github.com/mozilla/MozDef into watchlist_feature 2018-12-17 17:15:35 -06:00
Phrozyn 16a7d16cf3
PEP8, will need to retest that everything is functional after this 2018-12-17 17:12:35 -06:00
Phrozyn 2cdc5f1f8b
PEP 8 2018-12-17 17:01:32 -06:00
Brandon Myers 7dfc6ad913
Merge pull request #1003 from mozilla/generic_logincounts
Generic logincounts
2018-12-17 10:24:31 -06:00
Jeff Bryner 690f79627e rm unused imports 2018-12-15 14:19:07 -08:00
A Smith aa9f2d9105
Merge branch 'master' into watchlist_feature 2018-12-14 17:41:08 -06:00
Jeff Bryner 281df5324c update spacing 2018-12-14 15:30:25 -08:00
Jeff Bryner 1f4d7817f3 rename/rework query 2018-12-14 15:22:09 -08:00
Brandon Myers 46be867d2f
Fixup unused variables check 2018-12-14 14:06:21 -06:00
Brandon Myers df84a1942d
Fixup block comments not having a space after hash 2018-12-14 13:40:07 -06:00
Brandon Myers fc771bd531
Remove unused import statements 2018-12-14 11:34:42 -06:00
Phrozyn 043e911264
Final update for jwt code, removed jwt block from the nginx config to be configured externally via automation. 2018-12-13 16:30:37 -06:00
Phrozyn fb976afa95
Changing conditional from == to is 2018-12-12 16:51:17 -06:00
Phrozyn 04719cf80b
Removing exclude in favor of length condition. Fixing error logging. 2018-12-12 11:48:26 -06:00
Phrozyn f9436aabb2
adding length conditional for watchcontent. 2018-12-12 10:25:58 -06:00
Phrozyn a00024126a
removing whitespace 2018-12-12 10:10:07 -06:00
Phrozyn c092ada2c4
Removing text file version of watchlist. 2018-12-12 10:00:47 -06:00
Phrozyn 01bb8be0e0
pep8 fixes 2018-12-11 15:46:25 -06:00
Phrozyn e0440af89b
more pep8 changes. 2018-12-11 15:36:44 -06:00
Phrozyn 244ef87cfd
pep8 changes. 2018-12-11 15:25:21 -06:00
Phrozyn 7859a0bcba
fixing indentation on return in index.py. 2018-12-11 13:31:21 -06:00
Phrozyn 29cb0e099f
Adding alert to watchlist_feature that tests to work. 2018-11-29 18:30:55 -06:00
Phrozyn f7ece902a8
adding alert request api endpoint 2018-11-20 10:02:56 -06:00
Phrozyn 37599c7928
initial exposure of only our watchlist endpoint - WIP 2018-11-16 11:51:29 -06:00
Phrozyn 91fbc63f4e
resolving merge from master conflicts 2018-11-16 11:41:47 -06:00
Phrozyn bbf2d10e12
mergine master into branch with conflicts resolved. 2018-11-16 11:34:02 -06:00
Jeff Bryner a071b7a9f7 properly init the config 2018-11-13 09:43:49 -08:00
Jeff Bryner c41d849427 hook up the stop list to the config file 2018-11-13 08:51:35 -08:00
A Smith ee606a17e5
Merge branch 'master' into watchlist_feature 2018-11-12 14:49:42 -06:00
Jeff Bryner c4cd519bc4 fix imports 2018-11-12 10:47:00 -08:00
Brandon Myers deb4fc86c5
Update rest tests to use separate config 2018-11-12 12:35:40 -06:00
Jeff Bryner a7f4059cbe revert esservers to localhost 2018-11-12 08:31:58 -08:00
Jeff Bryner 092907b6b4 pep! 2018-11-11 20:46:00 -08:00
Jeff Bryner 1e0fc20713 pep! 2018-11-11 20:38:47 -08:00
Jeff Bryner 20d43a9e87 options 2018-11-11 20:32:12 -08:00
Jeff Bryner a2d0ff8fc0 remove the function in favor of the plugin 2018-11-11 20:03:51 -08:00
Jeff Bryner 984cb9d794 return results 2018-11-11 16:58:15 -08:00
Jeff Bryner 5599dd0f8d add datetime import 2018-11-11 15:46:42 -08:00
Jeff Bryner 5e77bbfa94 pass a dict 2018-11-11 15:45:28 -08:00
Jeff Bryner ee5c2caf56 correct the esservers option 2018-11-11 15:45:10 -08:00
Jeff Bryner a00e91d84d use the options sent to us 2018-11-11 14:42:47 -08:00
Jeff Bryner 69d2224a75 move function to plugin 2018-11-11 14:41:23 -08:00
Jeff Bryner 3e71d2f4fc rename the route, remove hard coded function 2018-11-11 14:41:15 -08:00
Brandon Myers b27537fd3a
Remove references to enableBlockIP config key 2018-11-09 15:11:21 -06:00
A Smith 01f37161c1
Merge branch 'master' into watchlist_feature 2018-11-08 13:55:08 -06:00
Brandon Myers 3b07f12cc9
Resolve E128 continuation line under indented 2018-10-31 18:11:08 -05:00
Brandon Myers 3fbeae4611
Resolve E127 continuation line over indented 2018-10-31 17:30:18 -05:00