MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
10,261 Commits
35 Branches
366 Tags
190 MiB
Commit Graph

8070 Commits (2e38015e8eaefd95fc9a3d3eca8640f64100490e)

Author SHA1 Message Date
chrisr3d 024b329faf Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-11-09 15:42:01 +01:00
chrisr3d a01a992914
add: [stix2 import] Parsing external process patterns 
- Also small update on process mapping since a
  recent update on Process MISP Object includes
  more attribute fields
 2018-11-09 15:39:23 +01:00
chrisr3d c090306908
add: [stix2 import] Parsing external network-traffic patterns 
- Code duplication is also avoided in attributes
  creation, since the only change is the mapping
  dictionary we can use the same function with
  only that parameter changing instead of having
  the same function multiple times
 2018-11-09 15:35:16 +01:00
mokaddem 2152493dd0 chg: [users/emails] Better comments 2018-11-09 13:42:28 +01:00
mokaddem 6bb31fbb1d chg: [users/email] Changed behavior of sending mail to avoid code duplication 
If an additional parameter is passed to the url, it will only shows the result of submitting the form without the submission
 2018-11-09 13:38:52 +01:00
mokaddem 296128fe54 fix: [users/emails] submission fix + cleaned code + comments 2018-11-09 12:12:06 +01:00
mokaddem 651861d1d8 new: [users/mails] Added possibility to send a mail to all users of the same organisation 2018-11-09 11:48:39 +01:00
mokaddem 9b44050e1c new: [users/mails] add confirmation popup before sending mails 2018-11-09 11:23:32 +01:00
chrisr3d 8dad1c3c91
add: [stix2 import] Parsing external regkey patterns 2018-11-09 11:06:53 +01:00
chrisr3d 2d72b30fef
fix: [stix2 import] Fixed relationship target uuid 2018-11-09 11:04:04 +01:00
chrisr3d d3ab9fb174
new: [stix2 import] Starting importing external pattern 
- Starting with File objects
- Also modified functions to make them reusable
 2018-11-09 10:19:28 +01:00
iglocska f4d658de76 chg: [documentation] Link to the rest client from the automation page 2018-11-09 09:29:29 +01:00
chrisr3d 62985d0640
fix: [cleanup] Updated function names to differentiate observable parsing from the next updates on pattern parsing 2018-11-08 21:24:51 +01:00
Alexandre Dulaunoy 671ff69969
chg: [taxonomies] added the exercise taxonomy from CSIRT network discussions 2018-11-08 14:34:56 +01:00
iglocska c3ec498f46 fix: [CLI] Fixed the CLI feed fetcher 
- use "all" to fetch all feeds
 2018-11-08 13:10:27 +01:00
chrisr3d 94028687cd
chg: [stix2 import] Parsing relationships & importing galaxies in the appropriate level 
- Importing Galaxies in attribute level when
  expected by relationships, and possible
- Importing Galaxies as before in event level
  otherwise
 2018-11-07 20:28:50 +01:00
iglocska abbc036436 fix: [sharing groups] Fixed several sharing group issues preventing proper editing of events with SGs 
- include the uuid and modified time in the sharing group
- fix the incorrectly embedded organisation object
 2018-11-07 16:06:49 +01:00
iglocska 0c40e91ca7 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-11-07 15:22:36 +01:00
iglocska 7706bfa8ea fix: [API] better handling of trying to edit an attribute without permissions to do so 2018-11-07 15:22:00 +01:00
Alexandre Dulaunoy 86d6909ade
chg: [taxonomies] updated to the latest version 2018-11-07 14:56:13 +01:00
chrisr3d 22eaaa3497 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-11-07 14:46:18 +01:00
chrisr3d 14e314ef7a
fix: [cleanup] Cleaned up STIX 1&2 export scripts 2018-11-07 14:45:29 +01:00
iglocska a48897849c fix: [API] throw a proper error when trying to edit an event without access to doing so 2018-11-07 14:24:00 +01:00
iglocska 6a620db304 new: [enrichment] separate caches for hover and persistent hover results 2018-11-07 11:42:53 +01:00
iglocska 31fbb30349 new: [enrichment] clickable popup changes 
- new persistent flag passed to misp modules to differentiate it from hovering
- various UI changes
 2018-11-07 11:26:08 +01:00
iglocska 9bcc68aa5c fix: [enrichment] linebreak woes 2018-11-07 10:32:08 +01:00
iglocska a74d778a78 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-11-07 10:26:16 +01:00
iglocska e124d3e30f fix: [enrichment] Adding proper linebreaks, cut 2 2018-11-07 10:24:44 +01:00
Alexandre Dulaunoy b874f24000
chg: [misp-taxonomies] updated with the new and latest changes 2018-11-07 10:17:03 +01:00
iglocska 1013a0ed5a fix: [cleanup] removed junk 2018-11-07 10:09:30 +01:00
iglocska d5d2b1448a chg: [enrichment] Linebreak handling for enrichment hovers 2018-11-07 10:08:47 +01:00
chrisr3d 6afadf1d26 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-11-07 09:36:47 +01:00
Christian Studer efe714c7a3
Merge pull request #3852 from RichieB2B/ncsc-nl/fix-stix-cidr 
Keep CIDR subnet size in STIX export
 2018-11-07 09:32:50 +01:00
chrisr3d 2c57f5f835
fix: [stix2 import] Taking Relationship objects target_ref as uuid 
- Better than using the Relationship id that is not
  going to be  represented in MISP
- We directly have the uuid of the object that will
  receive an Object Reference
 2018-11-07 09:12:10 +01:00
chrisr3d 00e08e0482 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-11-06 18:27:15 +01:00
chrisr3d a282ed23a5
fix: [stix2 import] Excluding patterns with any of some linking words 
- Since those patterns contain linking words we do
  not know how to map, we do not even try to parse
  them and only stix2-patterns will be created
  from them
 2018-11-06 18:20:02 +01:00
Christophe Vandeplas 551c877e9e
fix: fixes attribute popup UI issues with expansion 2018-11-06 15:26:05 +01:00
chrisr3d 3a9fc1e811
fix: [stix 1&2 export] Making initiation lists immutable 
- Lists only used for mapping should be immutable
  since they are not modified. Thus declaring as
  tuples is more appropriate
 2018-11-06 13:36:48 +01:00
Richard van den Berg 69fdac7efd Keep CIDR subnet size in stix export 2018-11-06 13:05:54 +01:00
Axpatito 1f40980949 Fixed double check if clause 2018-11-05 16:35:56 -06:00
Axpatito 542c52f868 Fix compare issue 2018-11-05 16:30:20 -06:00
iglocska 2d66dd421b new: [feeds] Changed default feed target to fixed event 
- major cause of death by overcorrelating
 2018-11-05 18:21:52 +01:00
chrisr3d bdf2a4a475
fix: [stix2 import] Better selection of objects to parse in object_refs 
- It is not nececssary to call parsing functions on
  reports in object_refs because they are already
  parsed through the loop iterating through reports
 2018-11-05 10:36:38 +01:00
chrisr3d 1e57d629e1
fix: [stix2 import] Using Report attributes instead of dictionary keys 
- Also improved the loop iterating through reports
 2018-11-05 10:05:17 +01:00
Steve Clement e909ea899c Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-11-05 13:43:28 +09:00
iglocska 7ab8b0e90a fix: [attribute search] Fixed invalid JS calls introduced as part of the rework (WiP) 2018-11-04 22:54:29 +01:00
chrisr3d e10a6d80ef
fix: [stix2 import] Try-catching Report objects creator reference 2018-11-04 21:29:09 +01:00
chrisr3d a30e038810 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-11-03 20:05:26 +01:00
chrisr3d 73910135f2
fix: [stix export] Fixed function header missing self attribute 2018-11-03 20:04:48 +01:00
iglocska 493e7bbd36 new: [attribute search] Rework of the UI version of the search to unify the functionalities with the event view 2018-11-03 12:49:29 +01:00
Alexandre Dulaunoy af5795ec08
chg: [misp-objects] updated to the latest version 2018-11-02 09:23:48 +01:00
iglocska 39ff6f4733 fix: [api] Invalid handling of empty parameters in the built in parameter builder 2018-11-02 04:26:17 +01:00
iglocska 89a9ad12b1 fix: [tags] showAttributeTag function now correctly culls galaxy tags 2018-11-01 22:11:14 +01:00
Andras Iklody 1bf6e57118
Merge pull request #3821 from StefanKelm/2.4 
super tiny typos
 2018-10-31 10:53:20 +00:00
Steve Clement fd43dce636 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-10-31 19:15:35 +09:00
mokaddem a39aa685f1 fix: #3774 [restResponse] added missing `includeEventTags` entry 2018-10-31 10:16:41 +01:00
mokaddem bbdbc475e3 chg: [eventview] changed default attribute sorting to timestamp->desc 2018-10-31 09:06:39 +01:00
mokaddem ac2257bdfd chg: [view/search] close opened popover when clicking the document 2018-10-31 08:27:35 +01:00
Steve Clement 0135f831bc Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-10-31 11:31:40 +09:00
mokaddem 4462a72206 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2018-10-30 22:00:32 +01:00
mokaddem 5c1522bc74 fix: [acl] bumped ACLComponent 2018-10-30 22:00:04 +01:00
Raphaël Vinot aabda96b3e fix: Travis build. 2018-10-30 18:59:48 +01:00
Raphaël Vinot 55b0335f66 chg: Bump Pymisp, misp-galaxy misp-objects taxonomies 2018-10-30 18:12:09 +01:00
chrisr3d eae548d4b6 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-10-30 17:47:30 +01:00
chrisr3d c047e04f39
new: [stix import] Marking parsing at attribute level 
- Made marking parsing function reusable for
  event & attribute levels
 2018-10-30 17:43:08 +01:00
mokaddem 55653e2fe2 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2018-10-30 17:18:24 +01:00
mokaddem c20553dfd5 new: [search/sighting] Possiblity to quickly add sightings on ID or VALUE when searching 2018-10-30 17:14:42 +01:00
StefanKelm 144e3d890d
typo 2018-10-30 16:53:26 +01:00
StefanKelm fadbe19809
typo 2018-10-30 16:52:50 +01:00
StefanKelm f59e859c3f
typo 2018-10-30 16:52:20 +01:00
StefanKelm a2bd1c5017
typo 2018-10-30 16:51:48 +01:00
StefanKelm 4825c3ce23
typo 2018-10-30 16:51:16 +01:00
StefanKelm 38af54cd2c
typo 2018-10-30 16:50:44 +01:00
StefanKelm 7af33b9412
typo 2018-10-30 16:50:12 +01:00
StefanKelm 0488e1f790
typo 2018-10-30 16:49:28 +01:00
StefanKelm dc17247b00
typo 2018-10-30 16:48:47 +01:00
StefanKelm 254ba10efe
typo 2018-10-30 16:47:52 +01:00
StefanKelm 49631a14d6
typo 2018-10-30 16:46:44 +01:00
chrisr3d 73daf834d6 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-10-30 15:41:08 +01:00
chrisr3d 9d6db57f32
fix: [stix import] Using standard error instead of standard output for missing types in mappings 2018-10-30 15:40:05 +01:00
chrisr3d 8152353fcc
fix: [stix import] Related objects parsing 
- Not only for observables as before, but also for
  observable objects in indicators
 2018-10-30 15:31:53 +01:00
iglocska 333cafca76 chg: [statistics] Show % of users with pgp keys 2018-10-30 14:58:49 +01:00
iglocska 3bdcca617e new: [statistics] Added local org and user/org counts 2018-10-30 14:51:27 +01:00
mokaddem 8370763407 new: [search] Added possibility to directly sight an attribute after a search 2018-10-30 14:15:28 +01:00
iglocska 2230904351 chg: [taxonomies] bumped 2018-10-30 12:24:58 +01:00
iglocska 67cc7508fa Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-10-30 11:21:53 +01:00
iglocska c7225102cd chg: [taxonomies] updated 2018-10-30 11:21:35 +01:00
chrisr3d ab8bfc9e42 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-10-30 09:36:58 +01:00
chrisr3d 73f01ac666
add: [stix import] Import of marking values as event tag, including AIS Marking 
- Mapping of markings
- More to come with the same operation for individual objects
 2018-10-30 09:33:18 +01:00
Alexandre Dulaunoy 4998bb42ec
chg: [sighting restSearch] API documentation fixed (/get is now /restSearch) 2018-10-30 07:01:23 +01:00
Steve Clement b113853a30 chg: [diag] Added warning message if getCurrentBranch() in Model/Server.php returns empty. 2018-10-30 09:41:06 +09:00
Aks6193 8f83041389
Update EventsController.php 
Add: Mactime object relationship
 2018-10-29 19:30:24 +00:00
iglocska ce3c78cd7d Merge branch 'sighting_api' into 2.4 2018-10-29 20:20:17 +01:00
iglocska bbc8a8bf4d fix: [API] minor fixes to the sightings api 
- fixed duplicate sighting tags in XML output
- added attribute value to the sighting
 2018-10-29 20:18:29 +01:00
iglocska 39a73a63cf Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-10-29 19:31:43 +01:00
iglocska ef2920d953 fix: [bug] Fixed bug with stacking login screens ontop of an event view 2018-10-29 19:31:07 +01:00
chrisr3d 3c8e643656
fix: [stix import] Using subclasses + Support of STIX coming from multiple MISP events 
- Using subclasses here allowed us to simplify some
  variables declarations and to reuse some functions
- STIX coming from multiple MISP events refers to
  STIX files created via the MISP to STIX export
  that can include multiple MISP events
 2018-10-29 16:23:08 +01:00
Steve Clement f3850747da chg: [config] Added permission check for .git directory 2018-10-29 09:56:12 +09:00
iglocska ea820888ef Merge branch '2.4' of github.com:MISP/MISP into HEAD 2018-10-28 14:25:26 +01:00
iglocska e22ed38d5b fix: [thumbnail] Thumbnail visualisation broken on proposals, fixes #3793 2018-10-27 23:08:31 +02:00
iglocska 168fd9f3b0 fix: [server] Allow certificates to be uploaded with other extensions besides .pem, fixes #3797 2018-10-26 21:14:22 +02:00
Alexandre Dulaunoy 78375eac91
Merge pull request #3808 from FloatingGhost/2.4 
Fix: AWS Errors when given empty array of elements
 2018-10-26 13:18:30 +02:00
Hannah Ward 608ddaa969
fix: aws would error if asked to del non-existing 2018-10-26 11:01:44 +01:00
chrisr3d ec7cd9b1fd
fix: [stix import] Avoided import of empty header description 2018-10-26 11:35:31 +02:00
chrisr3d 3d694bf6f1 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-10-26 10:25:43 +02:00
chrisr3d 0ab66374c9
fix: [stix export] Avoided putting Incident object as attribute everywhere 
- Incident is now a class attribute
- It also let us make the function parsing some
  not really common attribute types lighter by
  putting a conditionnal statement in another
  function
 2018-10-26 09:58:11 +02:00
chrisr3d 2731f3f6a5
fix: [stix export] Made 'header_comment' a list so we don't overwrite the value 
- There should only be one attribute matching the
  condition per event, but it is juste to be sure
 2018-10-26 09:40:10 +02:00
chrisr3d f27b69cfac
add: [stix export] Exporting STIX header description from the corresponding comment attribute 2018-10-26 09:34:34 +02:00
Alexandre Dulaunoy 702301565b
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-10-25 17:54:01 +02:00
Alexandre Dulaunoy 269e75d573
chg: [misp-objects] forensic objects added 2018-10-25 17:53:28 +02:00
chrisr3d 60548dc184
add: [stix import] Importing STIX header description as comment attribute 2018-10-25 16:41:31 +02:00
Raphaël Vinot 8018084194 chg: Bump misp-galaxy & taxonomies 2018-10-25 10:22:56 -04:00
Alexandre Dulaunoy 8363727674
Merge pull request #3799 from garanews/patch-1 
fix separate misspelling
 2018-10-25 09:54:30 +02:00
garanews aaa14a9ace
fix referred misspelling 
referred vs refered
 2018-10-25 09:48:12 +02:00
garanews 4501338233
fix separate misspelling 
separate vs seperate
 2018-10-25 09:12:17 +02:00
Alexandre Dulaunoy af0fb30869
chg: [misp-galaxy] updated to the latest version 2018-10-24 23:18:53 +02:00
Alexandre Dulaunoy fbebdc4a14
chg: [misp-objects] updated to the latest version (including many new objects) 2018-10-24 23:17:57 +02:00
iglocska e854428ec3 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-10-24 23:04:27 +02:00
Steve Clement 13974fb206
Merge pull request #3726 from pettai/shibb 
add date_created for provisioned users
 2018-10-24 20:11:37 +09:00
chrisr3d fa462f5db5 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-10-24 11:08:22 +02:00
chrisr3d 238cc35b33
fix: [stix import] Importing uuids for objects from external sources 2018-10-24 11:07:46 +02:00
chrisr3d c3a7fd27ff
fix: [stix import] Importing uuids for STIX files generated via MISP 2018-10-24 08:25:24 +02:00
Steve Clement 93dbc6f9ca chg: [tools] Changed testForBinExec as the x-sharedlib type is not only on OpenBSD, Debian has the same type when check if executable. 
chg: [tools] Added typeinfo to the return so you see in the UI what type it thinks it is. (In case you forced the parameter on the CLI)
 2018-10-24 09:22:47 +09:00
Sami Mokaddem 84b96f0ef8 fix: [sighting/api] added missing sighting source parameter 2018-10-23 18:26:10 +02:00
chrisr3d 58c48878ea
fix: [stix import] Improved uuid fetching 2018-10-23 16:40:47 +02:00
chrisr3d 9513c8437d
fix: [stix import] Better event & attribute distribution parsing 2018-10-23 16:37:13 +02:00
chrisr3d b8abc71b13 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-10-23 14:07:35 +02:00
chrisr3d ea71259176
fix: [stix import] Supporting DHS stix files with ais marking 2018-10-23 14:06:22 +02:00
chrisr3d 0df6120ea8
fix: [stix import] Fixed import of File Objects as single attribute 2018-10-23 14:05:04 +02:00
iglocska 1051ddca0e fix: [galaxy] added collection uuid capture 2018-10-23 14:03:35 +02:00
Sami Mokaddem 5763a74b96 chg: [sighting/api] improved comments 2018-10-23 13:39:29 +02:00
Sami Mokaddem d5be7e8ad9 chg: [RestResponse] bump 2018-10-23 13:30:32 +02:00
Sami Mokaddem d1fb94c332 fix: [ACL] bumped queryACL 2018-10-23 13:28:48 +02:00
Sami Mokaddem ff5f5faf02 new: [sighting/api] xml output format + improved error feedback 2018-10-23 13:06:37 +02:00
Sami Mokaddem 01cba114f2 fix: [sightings/api] now support json output format 2018-10-23 12:17:54 +02:00
Sami Mokaddem 99e5f560a8 new: [sighting/api] trying to follow the new API architecture. JSON 
export is broken but CSV is working. WIP...
 2018-10-23 11:24:03 +02:00
Sami Mokaddem 41d2de90db chg: typo 2018-10-23 00:05:24 +02:00
Sami Mokaddem 731a4d5e2b new: [Sightings/API] Added possiblity to get sightings based on a 
timerange/source/...
 2018-10-22 23:27:58 +02:00
Alexandre Dulaunoy 835dd3be15
chg: [misp-objects] updated to the latest version 2018-10-22 21:05:06 +02:00
chrisr3d 90fd773fb6 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-10-22 15:48:52 +02:00
chrisr3d 4803c3223c
fix: [stix framing] Fixed Related Package(s) xml field typo 2018-10-22 15:47:36 +02:00
chrisr3d 51dca41fbe
fix: [stix export] Fixed xml package string replacement 2018-10-22 14:58:10 +02:00
chrisr3d 58e8ea82cf
fix: [stix2 import] Avoiding errors when the imported file name is not specified 2018-10-22 14:11:21 +02:00
Alexandre Dulaunoy 264dcde45d
chg: [misp-galaxy] updated to the latest version 2018-10-22 14:06:17 +02:00
iglocska 2d0d14f92a fix: [view] Added uuids to galaxy cluster view 2018-10-22 10:40:10 +02:00
iglocska ae597c8358 new: [galaxy] Several changes 
- moved the current uuid field on cluster level to a new "collection_uuid" field to better represent the actual purpose
- added new uuid field that actually captures the cluster's uuid
- upgrade script is multi-execution safe
- added /galaxy_clusters/view to the API
- /galaxy_clusters/view can now be queried via the uuid instead of just the ID
 2018-10-22 10:36:13 +02:00
chrisr3d 337de16004 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-10-22 10:35:51 +02:00
chrisr3d e0deb68d7a
fix: [stix2 import] Fixed GalaxyCluster description 
- Since description is optionnal in some STIX 2.0
  objects, we test if the field is there before
  trying to use its value
 2018-10-22 10:30:15 +02:00
iglocska 5d6b7f564b fix: [routes] Added route for .csv parsing 2018-10-22 05:20:09 +02:00
iglocska 702d4360f6 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-10-21 22:47:59 +02:00
iglocska 1187fb2a27 new: [API] Added CSV as return format for event index 2018-10-21 22:47:22 +02:00
iglocska 572b0d13a4 new: [API description] Describe how to run diagnostics on MISP via the API 2018-10-20 15:58:43 +02:00
Alexandre Dulaunoy 0a7bde6d50
Merge pull request #3779 from MISP/att&ckMatrixFix 
fix: #3769 Att&ck matrix now render multiple kill_chain by column.
 2018-10-20 09:44:26 +02:00
Andras Iklody 04fe1c0cf6
Merge pull request #3778 from tomking2/2.4 
Fixes Issue #3633 - Returned XML has application/json Content-Type header
 2018-10-19 14:46:42 +02:00
Sami Mokaddem 8ce06f7351 fix: #3769 Att&ck matrix now render multiple kill_chain by column. 2018-10-19 12:28:59 +02:00
iglocska 4f4737d22a new: [upgrade] Preparing the data for recovery after the object reference sync fix 
- update the timestamps of all events / objcts that are affected and are locked = 0
 2018-10-19 11:25:55 +02:00
Tom King 8925e88581 fix: Check if the format is xml or application/xml on __sendResponse 2018-10-19 09:54:51 +01:00
iglocska e5e9701fbb Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-10-19 10:12:59 +02:00
iglocska bc06f07848 fix: [cleanup] Removed debug from the bug fixing session 2018-10-19 10:10:34 +02:00
Steve Clement cebca8bcb7 chg: [tools] Added x-sharedlib clause in testForBinExec if on OpenBSD. 2018-10-19 08:53:10 +09:00
iglocska 0b0432536a chg: [warninglist] warninglists updated, fixes #3775 2018-10-18 20:18:06 +02:00
iglocska 6b60f3fa5c Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-10-18 20:13:27 +02:00
iglocska e419c80e9e fix: [internal] Sharing group capturing fixed, fixes #3573 
- As reported by @eCrimeLabs
 2018-10-18 20:12:24 +02:00
iglocska 6f9551e202 fix: [internal] Unneeded model initialisation for getDefaultAttachments_dir() 2018-10-18 20:10:11 +02:00
chrisr3d 91807f5052
fix: [stix2 import] Fixed MISP event info field when importing STIX2 without report object 2018-10-18 15:13:19 +02:00
chrisr3d f20b4f70cd
fix: [stix2 import] Fixed json dict monkey syntax error 2018-10-18 15:12:21 +02:00
iglocska a40aa1748e fix: [internal] getPythonVersion woes 2018-10-18 15:01:04 +02:00
iglocska c96be93e3c fix: [internal] Fix of wonky model function calls across the application for getting default attachment directories 2018-10-18 09:51:14 +02:00
iglocska 53cf70a415 chg: [Galaxy] Updated MISP galaxies 2018-10-17 21:00:57 +02:00
iglocska 35fabbe7f6 fix: [Galaxy] Various fixes to blocking issues with the galaxy update system, fixes #3773 2018-10-17 20:59:51 +02:00
iglocska 9057123d6d fix: [API] Handle multiple event IDs being queries or not using the event ID filter when generating the CSV output file names 2018-10-17 20:38:24 +02:00
Andras Iklody 189f29cf63
Merge pull request #3768 from devnull-/#3748_download_files 
Fix CSV filename #3740
 2018-10-17 20:36:13 +02:00
iglocska 457e342cc6 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-10-17 12:32:19 +02:00
iglocska 0bda88db39 fix: [internal] Fixes to invalid model function calls 2018-10-17 12:31:43 +02:00
chrisr3d d464fa820a Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-10-17 09:47:46 +02:00
iglocska 7a01de5359 new: [API] Added a way to use the API to throw values at the warninglist for quick evaluations of the values 2018-10-16 17:57:14 +02:00
iglocska 91983ffdef new: [logging] Log why an event could not be pulled 2018-10-16 14:05:30 +02:00
Amaury Leroy 225e6b9f91 Rebase issue 1643 2018-10-16 14:02:46 +02:00
Amaury Leroy db782440f2 Define filename (instead of download.csv) 2018-10-16 11:32:11 +02:00
Andras Iklody 35400ef309
Merge pull request #3765 from IFX-CDC/2.4 
add: workers diagnostics to the server settings
 2018-10-16 10:57:14 +02:00
chrisr3d 241fe257af
add: [stix2 import] Added an entry to the simple pattern mapping dictionary 2018-10-16 10:56:04 +02:00
Andras Iklody 540aa9443f
Merge pull request #3762 from SteveClement/py-virtualenv 
chg: [tools] Added the option to have Python Virtualenv support
 2018-10-16 09:46:24 +02:00
Steve Clement 4753135d29 chg: [i18n] extracted latest strings to default.pot and cake_dev.pot 2018-10-16 11:41:57 +09:00
Steve Clement c13f7ecc20 chg: [i18n] New strings in Spanish translation 2018-10-16 09:06:43 +09:00
Steve Clement ac8b929b7e chg: [i18n] Updated to latest jpn translation, minor changes. 2018-10-16 08:40:50 +09:00
netjinho c9540f3ad2 Fixed workers tab 2018-10-15 19:17:46 +02:00
netjinho 8a6c202e50 Added workers diagnostics to the server settings 2018-10-15 18:18:47 +02:00
Steve Clement ca4e17fd3e chg: [i18n] Added 100% French translation. Thanks to all involved so 
far.
wq
 2018-10-15 23:04:30 +09:00
www-data f9183dee3b Merge branch '2.4' into py-virtualenv 2018-10-15 17:09:18 +09:00
iglocska 2b188039d6 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-10-14 09:22:25 +02:00
iglocska b4f084f9fe new: [API documentation] Added some missing API templates 2018-10-13 22:42:20 +02:00
Alexandre Dulaunoy f26d206989
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-10-13 09:08:46 +02:00
Alexandre Dulaunoy 0b821c6ba5
chg: [misp-galaxy] updated to the latest version 2018-10-13 09:08:13 +02:00
chrisr3d 9ace44283f Merge branch '2.4' of github.com:MISP/MISP into chrisr3d_patch 2018-10-12 16:30:42 +02:00
chrisr3d 94f47a5321
fix: [stix2 import] Made NetworkTraffic objects import include all the possible cases 
- We were potentially missing some DomainName
  or IP Address objects data, when it is not
  a reference of the NetworkTraffic object.
- Now we look if we still have some of these
  objects that did not have been parsed, and
  in that case, parse them.
 2018-10-12 16:16:48 +02:00
Raphaël Vinot e63d8edd21 chg: Bump PyMISP & recommended version 2018-10-12 16:02:56 +02:00
chrisr3d 625df71959 Merge branch '2.4' of github.com:MISP/MISP into chrisr3d_patch 2018-10-12 12:25:12 +02:00
chrisr3d e533d06112
fix: [stix2 import] Quick change on event loading 
- Specifying the encoding within the file opening
- Allows to get rid of 1 'encode()' call
 2018-10-12 12:23:24 +02:00
chrisr3d f4478d9ce5
fix: [stix2 import] Better parsing for objects that can be imported as either ip-port or network-socket 2018-10-12 12:01:04 +02:00
iglocska 09ec9aecd6 new: [API] Added the log index/search to the API 
- described in the templates / rest client page
 2018-10-11 20:20:27 +02:00