Commit Graph

166 Commits (master)

Author SHA1 Message Date
Alexandre Dulaunoy 28dcfb6f39
Merge pull request #82 from arcsector/master
Bringing up-to-date with recent PyMISP and Optional Deduplication
2022-06-14 09:44:27 +02:00
George Haraksin 2aa3522cae excepting Exception instead of BaseException 2022-06-14 00:02:15 -07:00
George Haraksin 43a27c83b1 even better logging 2022-06-14 00:01:09 -07:00
George Haraksin 8ec9fc18c5 Merge branch 'master' of https://github.com/arcsector/MISP-Taxii-Server 2020-06-16 01:13:11 -07:00
haraksin 67d08c443f try/except on pymisp loading stix failing 2020-06-16 01:12:23 -07:00
George Haraksin f25304c815 Merge branch 'master' of https://github.com/arcsector/MISP-Taxii-Server 2020-06-15 19:26:25 -07:00
haraksin e020452a3d invalid syntaxi in except clause 2020-06-15 19:26:07 -07:00
George Haraksin aa7e345e68 Merge branch 'master' of https://github.com/arcsector/MISP-Taxii-Server 2020-06-15 19:24:39 -07:00
haraksin 0aaed66540 Checking for MISP existence 2020-06-15 19:24:18 -07:00
George Haraksin 4fd353fbec Merge branch 'master' of https://github.com/arcsector/MISP-Taxii-Server 2020-06-15 19:01:31 -07:00
haraksin 67f9c52def adding try/except for pymisp error 2020-06-15 19:00:47 -07:00
George Haraksin 27e667b2f0 Merge branch 'master' of https://github.com/arcsector/MISP-Taxii-Server 2020-06-15 18:53:46 -07:00
George Haraksin 03aa19467e fixing merge conflicts 2020-06-15 18:49:45 -07:00
haraksin e4ab93e954 fixing logging changes 2020-06-15 18:12:24 -07:00
haraksin 6056501ff4 Adding checking if connection to MISP is valid 2020-06-15 18:08:33 -07:00
George Haraksin a850a0051f Merge branch 'master' of https://github.com/arcsector/MISP-Taxii-Server 2020-05-14 16:53:20 -07:00
haraksin 461452f420 Adding log about MISP publish skip 2020-05-14 16:43:01 -07:00
George Haraksin 59fb6f27e8 Merge branch 'master' of https://github.com/arcsector/MISP-Taxii-Server 2020-05-14 16:38:47 -07:00
haraksin 5cc5f99c45 Making sure collections returned from manager instance are only the ones we want 2020-05-14 16:38:28 -07:00
George Haraksin 4db2a43e6d Merge branch 'master' of https://github.com/arcsector/MISP-Taxii-Server 2020-05-14 16:33:43 -07:00
haraksin 4d9f63522b Using UUID instead of ID for publish event log 2020-05-14 16:33:15 -07:00
George Haraksin 0303688af3 Merge branch 'master' of https://github.com/arcsector/MISP-Taxii-Server 2020-05-14 16:27:12 -07:00
haraksin 310d8145d5 Making sure config can't be switched to unknown if it's false 2020-05-14 16:26:51 -07:00
George Haraksin 0326daf2b1 Merge branch 'master' of https://github.com/arcsector/MISP-Taxii-Server 2020-05-14 16:19:16 -07:00
haraksin 9b8ed9ddf9 Adding better logging 2020-05-14 16:18:53 -07:00
George Haraksin ad1834acb2 Merge branch 'master' of https://github.com/arcsector/MISP-Taxii-Server 2020-05-14 16:15:43 -07:00
haraksin 4a41e963df getting collection names for name lookup 2020-05-14 16:15:23 -07:00
George Haraksin 1a083c7378 Merge branch 'master' of https://github.com/arcsector/MISP-Taxii-Server 2020-05-14 15:55:50 -07:00
haraksin 934bcf1b6a Adding collections and publish args and features. 2020-05-13 19:21:52 -07:00
George Haraksin c28ab6f3af fixing merge conflicts 2020-05-13 15:30:46 -07:00
haraksin 00e70113ad Add src/ to gitignore 2020-05-13 15:29:20 -07:00
George Haraksin f3c583f0f4 adding src/ to gitignure 2020-05-13 15:28:11 -07:00
haraksin 8a20458898 removing gitignore changes 2020-05-13 13:59:56 -07:00
haraksin 823822bbf1 Making dedup optional 2020-05-13 13:49:34 -07:00
haraksin c55f9994c6 Adding deduplication as an optional item 2020-05-13 13:41:12 -07:00
haraksin 277dfcdb97 Dealing with key issue in search
Line 70
2020-05-06 21:05:36 -07:00
haraksin b50a60485f adding Loader to push_published_to_taxii
adding local-server default yaml and remote-servers default yaml
2020-05-06 17:28:04 -07:00
arcsector 53309e3477
Include Loader in hooks.py 2020-05-06 17:00:04 -07:00
arcsector c86e4940af
Including pyaml's Loader to suppress warnings
See these docs for info: https://github.com/yaml/pyyaml/wiki/PyYAML-yaml.load(input)-Deprecation
2020-05-06 16:58:21 -07:00
Hannah Ward 2300977908
Change default param of override uri 2019-04-02 10:36:55 +01:00
Hannah Ward 1e46961dad
Move mysqlclient instruction above pip operation 2019-03-06 13:54:54 +00:00
Hannah Ward e7389306bb
new: Add resolution for multiple POLL uris 2019-02-21 13:50:06 +00:00
Hannah Ward 2e2081ec48
chg: PEP8 push script 2019-02-18 11:28:44 +00:00
Hannah Ward a84e728b14
fix: Update FAQ for new sync-data script 2019-02-15 12:18:28 +00:00
Hannah Ward b85136826d
fix: Sytax of tests 2019-02-12 17:32:50 +00:00
Hannah Ward bc8a6ee9b2
fix: Just use one test file 2019-02-12 17:28:31 +00:00
Hannah Ward 629566b3eb
fix: don't try to install submodules 2019-02-12 17:17:28 +00:00
Hannah Ward 8c0db22b0f
fix: Update installation instructions 2019-02-12 17:12:32 +00:00
Hannah Ward 734cfecd0e
chg: Move to latest openTaxii 2019-02-12 17:11:36 +00:00
Hannah Ward 0f598f9f88
fix: Remove now unsubmoduled directories 2019-02-12 16:41:25 +00:00