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

8191 Commits (66ae444957a9c0be76925b7f6d7a7936d64f69dc)

Author SHA1 Message Date
Alexandre Dulaunoy 6a60438229
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-12-11 14:13:15 +01:00
Alexandre Dulaunoy cef0931d46
chg: [misp-galaxy] updated to the latest version 2018-12-11 14:12:21 +01:00
iglocska 47c9f6114e fix: [API] Attribute tags could be added by 3rd parties via the API 
- fixed
 2018-12-11 11:36:40 +01:00
Christophe Vandeplas 589070a5cd fix: [objecttemplates] fixes issue #3921 2018-12-09 14:58:25 +01:00
Alexandre Dulaunoy 8982fdac8a
chg: [taxonomies] updated to the latest version 2018-12-09 12:18:30 +01:00
Andras Iklody c733857fef
Merge pull request #3924 from keram79/patch-1 
Fix error handling in Server.php
 2018-12-08 09:41:06 -05:00
iglocska 2aef86abf1 fix: [API] tags/attachTagToObject wasn't unpublishing events correctly 2018-12-07 16:33:08 +01:00
chrisr3d 8ce3d46a91 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-12-07 15:40:18 +01:00
chrisr3d 87190f6510
fix: [restSearch] Using the correct python version to call STIX scripts 
- Using the correct python defined in virtual env,
  if available, and the default global python3
  otherwise
 2018-12-07 15:31:04 +01:00
Sami Mokaddem 3e8b96a13d fix: [attachement] prevent creation of empty event 2018-12-07 15:01:37 +01:00
keram79 e34e62efe8
Fix error handling in Server.php 
according to http://php.net/manual/de/exception.getmessage.php , the parenthesis are required
 2018-12-06 19:42:44 +01:00
Raphaël Vinot 083beae502
chg: Bump PyMISP recommended version 2018-12-06 15:27:02 +01:00
chrisr3d aea66ccac1
fix: [stix import] Fixed missing event fields import 
- Such as event info, event date and so on
 2018-12-06 14:39:47 +01:00
iglocska 6d6528a4bc fix: [STIX2] fixed stix2 to use the internal original file capture 2018-12-06 12:06:42 +01:00
iglocska 06fd4bba4e fix: [internal] Fixed the original file capture tool 2018-12-06 12:01:30 +01:00
iglocska 9d527ee8f5 fix: [UI] Fixed event edit warning 2018-12-06 11:57:18 +01:00
iglocska 6dfeb8934b Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-12-06 11:47:55 +01:00
iglocska 211ac07372 fix: [internal] Handle the upload of original versions of ingested files via a helper function instead of leaving it to external tools 2018-12-06 11:47:14 +01:00
chrisr3d 6dc88f1e1a Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-12-06 11:43:35 +01:00
chrisr3d 768d87e9de
fix: [stix import] Fixed indicators parsing 
- For stix1 generated with MISP
 2018-12-06 11:41:30 +01:00
chrisr3d c633fb3c12
fix: [stix import] Made sure the header description value fetching test is working is all cases 2018-12-06 11:40:19 +01:00
Andras Iklody 3e4e75014b
Merge pull request #3912 from Sh3idan/fix-incoherence-types-and-categories 
fix: [model-data] Network activity category: add x509-...-md5 and x509-...-sha256
 2018-12-05 04:20:53 -05:00
iglocska b9d4888f27 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-12-05 09:40:28 +01:00
iglocska 258e548d9d fix: [UI] Fixed crappy old style flash mesage on events/add that has been an eye sore for ages 2018-12-05 09:39:51 +01:00
iglocska 20b37d7a87 new: [usability] Object templates view also accepts uuid as input vector 2018-12-05 09:35:19 +01:00
iglocska 3c227f0621 new: [UI] Added warning for users not to edit events as site admins 2018-12-05 09:34:46 +01:00
chrisr3d 0469b4848d Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-12-04 12:01:51 +01:00
chrisr3d d7cc403826
fix: [stix import] Fixed header description value fetching 
- Again yes, but with the correct test now
 2018-12-04 11:59:44 +01:00
Alexandre Dulaunoy ac991483ca
chg: [misp-galaxy] updated to the latest version 2018-12-04 11:26:33 +01:00
iglocska 48b84a04fd Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-12-04 11:07:08 +01:00
Raphaël Vinot 24fdc34df8
chg: Bump PyMISP recommended version. 2018-12-03 17:15:23 +01:00
iglocska 7759c62a8e new: [CLI] Documentation updated 2018-12-03 11:08:06 +01:00
iglocska 33b5fa8535 fix: [CLI] Added bruteforce protection cleaning 2018-12-02 21:39:01 +01:00
iglocska 601e05bb4a new: [Rest] Added system for GET requests in the templating system 2018-12-01 09:23:03 +01:00
chrisr3d b24c204b3a
fix: [stix2 import] Fixed pattern parsing for a specific case 2018-11-30 14:53:16 +01:00
iglocska b5e27db081 new: [ReST] Added statistics 2018-11-30 12:15:08 +01:00
co59 bbeef129c0 fix: [model] Network activity category: add x509-fingerprint-md5 and x509-fingerprint-sha256 2018-11-29 23:07:11 +01:00
iglocska 0365cb19b1 fix: [API] previous commit fixed 2018-11-29 17:18:42 +01:00
iglocska e289db66aa fix: [internal] When editing an object to add new attributes, correctly set the default distribution if nothing is set 2018-11-29 17:14:56 +01:00
iglocska ce7704e4c5 fix: [API] object edit fixed to return the object in the correct format 2018-11-29 17:09:04 +01:00
iglocska 5c9fbe474a fix: [API] when adding an object, the response should have the correct format 2018-11-29 16:47:23 +01:00
iglocska 665b6ccbae fix: [internal] if no attribute distribution is found in the event edits, set the default instead of defaulting to 0 2018-11-29 15:33:45 +01:00
Andras Iklody 430ddcd79c
Merge pull request #3770 from devnull-/issues_1643_rebase_2.4 
Issues 1643 -- Fix publish_without_email when an event is modified -- rebase
 2018-11-29 04:54:59 -05:00
Steve Clement dc00a249e2 fix: [i18n] Added __() where needed. 
fix: [doc] Typo in field.
 2018-11-29 12:38:33 +09:00
iglocska 1684ae694b Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-11-28 14:00:50 +01:00
iglocska 1edc1a655a fix: [merge conflict] resolved, 
- as notified by @a1ext
 2018-11-28 13:59:12 +01:00
devnull- 299db8ada8
Merge pull request #8 from MISP/2.4 
Update issue 1643 rebase 2.4
 2018-11-27 16:40:05 +01:00
chrisr3d 5dabeca956 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-11-27 10:31:30 +01:00
chrisr3d db5d9faa3c
add: [stix2 import] Parsing external standalone ip address observables 2018-11-27 10:30:45 +01:00
Anthony Vaccaro eab6ca62e3 fix typo in called method name 2018-11-27 10:02:25 +10:00
chrisr3d caa5d82462 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-11-26 16:58:41 +01:00
chrisr3d e97b8988c1
add: [stix2 import] Importing external standalone ip address patterns 2018-11-26 16:57:46 +01:00
chrisr3d 228ffd82e9
fix: [stix2 import] Function name typo 2018-11-26 16:57:01 +01:00
chrisr3d 00a9a08436
fix: [stix2 import] Handling cases where we have no galaxy 2018-11-26 16:53:08 +01:00
Sascha Rommelfangen 7425c87bef fix: [freetext] fix notice on freetext import 2018-11-26 16:07:39 +01:00
chrisr3d ba1a4811a9 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-11-26 09:43:17 +01:00
chrisr3d ef242f3eb3
fix: Fixed elements returned by the url object parsing function 
- Was raising an unexpected exception in a special
  case, which was skipping the entire object,
  because of a missing element to return
 2018-11-26 09:39:33 +01:00
iglocska af0f40ab97 new: [server settings] Added automatic backup system for the server settings 2018-11-26 09:12:01 +01:00
iglocska 0fbe40e121 new: [UI] Explain what caching vs fetching feeds means 
via hover column header
 2018-11-25 23:55:15 +01:00
iglocska db5d61725a chg: [bro] Preparation for the move to restsearch 
- also fixed some edge-case issues
 2018-11-24 21:35:50 +01:00
iglocska 845a758289 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-11-23 16:22:17 +01:00
iglocska 2aeafd8b79 fix: [sync] Fixed a blocking bug preventing a full push from working with sharing group events 2018-11-23 16:21:48 +01:00
chrisr3d 37d9fcf81b Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-11-23 16:15:33 +01:00
chrisr3d b755cb8eea
fix: Fixed header description value fetching 2018-11-23 16:15:03 +01:00
iglocska 8a223f6ace fix: [ACL] ACL updated 2018-11-23 15:52:18 +01:00
iglocska 86a028adb3 fix: [mactime] Some minor fixes 2018-11-23 15:31:24 +01:00
iglocska 1ca46ea6ff Merge branch 'new_mactime_feature' into mactime_merge 2018-11-23 14:52:43 +01:00
iglocska 65da1e8fa8 fix: [CS] CS brought up to date 2018-11-23 14:22:18 +01:00
iglocska 2d0259ce13 fix: [CS] coding standards script re-run 2018-11-23 14:11:33 +01:00
iglocska e7b964b155 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-11-23 13:48:29 +01:00
iglocska e76d811739 fix: [UI] clarification of the istance owner organisation field on the servers/add view 2018-11-23 13:47:52 +01:00
iglocska fdfd1b8026 chg: [documentation] Documented the freetext import API on the automation page 2018-11-23 13:47:27 +01:00
iglocska 86a27e7c31 fix: [CSV] Fixed some defaults for the CSV export 2018-11-23 13:47:06 +01:00
iglocska 5220dcec72 new: [API] Various enhancements and fixes to the APIs 
- Added result count to restsearch API via the x-result-count header
- Added the includeProposals parameter to the attribute level restsearch
- Readability of events controller improved
- Fixed a bug blocking malware samples from being added using /events/add when the encrypt=1 flag was set for raw sample inclusion
 2018-11-23 13:44:19 +01:00
Sami Mokaddem 0992dc73dc fix: [ui] prevent glitchy popover by increasing item size 2018-11-23 08:35:11 +01:00
Alexandre Dulaunoy af715c7b75
chg: [warninglists] updated to the latest version 2018-11-22 15:50:33 +01:00
Alexandre Dulaunoy 9dbccf81be
chg: [misp-galaxy] updated to the latest version 2018-11-22 15:47:50 +01:00
Alexandre Dulaunoy 978846a78f
chg: [taxonomies] updated to the latest version 2018-11-22 15:47:19 +01:00
Alexandre Dulaunoy 680c6774b5
chg: [misp-objects] updated to the latest version 2018-11-22 15:46:27 +01:00
chrisr3d 51f1e5d6fc
add: [stix2 import] Added new combinaison of external pattern types 2018-11-22 10:15:45 +01:00
Andras Iklody b40c9c6769
Merge pull request #3895 from plbolduc/bugfix/objectreference 
fixed an issue where the referenced_type was not an integer.
 2018-11-22 06:09:06 +01:00
Sami Mokaddem 7f71f2d4f8 fix: [mispObject] fixed disable_correlation saving & display issue 
Before this fix, MISP was not saving any modification related to disable_correlation.
Moreover, the value of disable_correlation was always set to the one specified in the object's template
regardless of its actual value.
 2018-11-21 15:25:03 +01:00
Christophe Vandeplas 5701dda67b fix: fixes variable initialization inconsistency in Server push 
Fixes issues like: Warning (2): count(): Parameter must be an array or an object that implements Countable in [/var/www/MISP/app/Model/Server.php, line 2353]
 2018-11-21 15:55:12 +02:00
pbolduc c5bdc700ce fixed an issue where the referenced_type was not an integer. 2018-11-20 15:42:17 -05:00
iglocska bef72f9465 fix: [API] Fix non exportable tags being included in the attribute level restsearch 2018-11-20 19:53:02 +01:00
iglocska 63940564e0 fix: [API templates] Clarification about the serversettings API 2018-11-19 22:04:00 +01:00
chrisr3d 4bcad73c1e Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-11-19 08:47:20 +01:00
chrisr3d 31fda3c827
fix: [stix import] Fixed uuid fetching 2018-11-19 08:46:31 +01:00
iglocska 7bd8638357 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-11-18 12:00:58 +01:00
Alexandre Dulaunoy 8bbf601a75
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-11-18 07:09:42 +01:00
Alexandre Dulaunoy 474b77aff2
chg: [misp-galaxy] updated to the latest version 2018-11-18 06:40:01 +01:00
iglocska 3d0e6ca2f1 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-11-15 14:58:18 +01:00
iglocska 7c34e9bbee fix: [sync] Fixed an issue preventing sharing group distributed data from being pushed 2018-11-15 14:57:41 +01:00
Steve Clement 0b6291150f Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-11-15 17:31:40 +09:00
Alexandre Dulaunoy f1086cd825
chg: [misp-galaxy] updated to the latest version 2018-11-14 20:48:44 +01:00
iglocska eef8e8f397 Merge branch '2.4' into contact 2018-11-14 20:37:20 +01:00
iglocska 64544a647a chg: [contact email] Aligned button colours with the rest of the UI 2018-11-14 20:36:59 +01:00
iglocska 1d6c7dc53e Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-11-14 20:11:09 +01:00
iglocska aa15896839 fix: [objects] Fixes issue #3874 
- shouldn't be allowed in the first place
 2018-11-14 20:10:22 +01:00
chrisr3d c0af417a43 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-11-14 09:23:00 +01:00
chrisr3d b4f9603a89
fix: [stix import] Fixed Tags import 2018-11-14 09:22:09 +01:00
iglocska a28909d366 new: [freetext] Added BTC recognition, fixes #3864 2018-11-13 12:06:00 +01:00
iglocska 248c5bb93d fix: [missing files] added missing templates 2018-11-13 11:53:18 +01:00
iglocska e4d4e579cd Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-11-13 11:50:38 +01:00
iglocska 4cd3811142 new: Various fixes to the reporting of validation errors for saving attributes 
- view the failed/succeeded saves in batch imports, fixes #3866
- fixed a bug that inserted junk into the flash messages, fixes #3863
- fixed a bug that removed all but the last entry in a failed batch import #3865
 2018-11-13 11:48:12 +01:00
mokaddem d125f6d19a fix: [admin/email] replaced hardcoded url into baseurl 2018-11-13 07:43:26 +01:00
Steve Clement af265b299a
Merge pull request #3826 from MISP/sortingOnTimestamp 
chg: [eventview] changed default attribute sorting to timestamp->desc
 2018-11-13 12:38:17 +09:00
Steve Clement c3e0b22136 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-11-13 12:13:01 +09:00
iglocska 68c34be107 Merge branch 'rest_link' into 2.4 2018-11-12 12:05:08 +01:00
iglocska d27b599515 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-11-12 12:03:29 +01:00
iglocska cfe934fb93 new: [search] Rework of the UI attribute search complete 2018-11-12 11:59:56 +01:00
chrisr3d 2adef5897c
fix: [stix export] Fixed dictionary update which requires lists and not tuples 2018-11-12 08:02:14 +01:00
iglocska 28cd032264 chg: [seach] WIP, more work on the attribute search's JS components 2018-11-11 23:13:25 +01:00
iglocska 316543ce3b fix: [API] CSV ignore flag restored to old behaviour 
- if not set, only return published events / to_ids flagged events by default
- setting ignore:0 will result in the default behaviour
- setting ignore:1 will result in unpublished events and non to_ids attributes being filtered out
- fixed a bug that broke the CSV api if ignore:0 was passed
 2018-11-11 21:06:57 +01:00
iglocska 6acd4aeed2 chg: [search] Further progress on the attribute search UI 2018-11-10 19:05:58 +01:00
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
mokaddem ac49b0b231 new: [restClient] Added support of URL param in the querybuilder widget 2018-11-09 09:55:20 +01:00
iglocska f4d658de76 chg: [documentation] Link to the rest client from the automation page 2018-11-09 09:29:29 +01:00
mokaddem 8befc07fb5 new: [restClient] Transform query to json, more descriptions and layout changes 
- Added a lightweight query parser to construct the JSON body from the query builder
- Added more help text on API fields
- Added help hoover on API fields (when applicable)
- Added `optgroup` in template select
- Slight CSS modification on the overall page
- Changed behavior of template fetching (template existance is checked locally, do not wait before pulling the API info HTML)
 2018-11-09 08:58:58 +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
mokaddem 695b71c555 chg: [Model] swapped openioc and json so that json is selected by default 2018-11-07 11:39:39 +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
mokaddem c48afbccb1 chg: [rest client] re-ordered fields by alphabetical order 2018-11-07 11:03:25 +01:00
mokaddem 3c203e05d9 chg: [rest client] added some overwrite functions 2018-11-07 11:02:30 +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
mokaddem 7f5225b154 new: [rest client] added first draft of querybuilder widget 2018-11-06 16:54:17 +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