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
chrisr3d 0f15b1e5a7 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-12-18 11:36:46 +01:00
chrisr3d 91b1fe1db4
fix: [stix import] Fixed parsing of Custom objects 2018-12-18 11:36:04 +01:00
Sami Mokaddem 55c8f8dc82 chg: [restClient] Still show help for nested parameters instead of 
crashing
 2018-12-18 11:34:36 +01:00
Sami Mokaddem 00f4cd13c2 chg: [restResponse] removed space in parameters 2018-12-18 11:33:51 +01:00
iglocska 0e91baa040 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-12-18 10:25:23 +01:00
iglocska 1b358f730e fix: [correlations] Invalid orgc loaded in the attribute level correlations, fixes #3948 2018-12-18 10:24:11 +01:00
Andras Iklody c800b4b05b
Merge pull request #3954 from kfinny/fix-enrich-event-job-not-marked-as-completed 
Fixes #3907, enrich event job not marked as completed.
 2018-12-18 09:59:04 +01:00
iglocska 5e8392ae3f Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-12-18 09:46:48 +01:00
iglocska ba3ae0094c chg: [WIP] added function meant to resolve id vs uuid issues for the UI attribute search 
- still needs some love
 2018-12-18 09:46:02 +01:00
iglocska b1db12d242 fix: [UI] hover size fixed and scroll bar added 
- part of the keep @rommelfs happy project
 2018-12-18 09:44:50 +01:00
Kevin 9446c93ad4 Fixes #3907, enrich event job not marked as completed. 
The enrichment background process did not do anything to update the job
after completing its task.  I used the same logic as the adjcacent
'publish' function to record progress, update the message and create a
log entry.
 2018-12-17 13:55:59 -05:00
Alexandre Dulaunoy ac063792f9
chg: [UI] Clarify the definition of "hide_tag" to an unselectable tag 2018-12-17 18:14:53 +01:00
Sami Mokaddem 45f72787c4 chg: deleted comments 2018-12-17 18:13:07 +01:00
Sami Mokaddem 764b591789 chg: [restClient] Do not show empty rule if builder shown after template 
picking.
Reset the query builder rules if templates is not picked before showing the builder
 2018-12-17 17:17:59 +01:00
Sami Mokaddem 52346f00ef fix+new [restClient] fixed merge glitch and added support of 
`includeProposals`
 2018-12-17 17:15:05 +01:00
Sami Mokaddem 54162e4a82 chg: re-indented view file 2018-12-17 16:43:27 +01:00
Sami Mokaddem ed4f752d3a Merge remote-tracking branch 'origin/2.4' into querybuilder 2018-12-17 16:36:27 +01:00
Sami Mokaddem 11c76c2498 chg: [restClient] prevent usage of query builder if template not picked 2018-12-17 16:13:24 +01:00
Sami Mokaddem 1d43ff4e1f fix: [restClient] form submission is working again. 
was blackholed due to form tampering
 2018-12-17 11:14:05 +01:00
iglocska 54bb5f3d01 new: [tag_collections] Added db upgrade 2018-12-15 10:02:38 +01:00
Alexandre Dulaunoy b2b382f159
chg: [misp-galaxy] updated to the latest version (major update in Malpedia) 2018-12-15 09:29:10 +01:00
iglocska ecf52d5cb8 new: [Tag collections] Added boilerplate models 2018-12-14 20:25:38 +01:00
Sami Mokaddem 05e66de1bc chg: [restClient] added `show query builder` button 2018-12-14 16:32:27 +01:00
Sami Mokaddem f16bb4756e chg: [restClient] re-indented the whole file 2018-12-14 16:05:18 +01:00
Sami Mokaddem 720c4315ce chg: [restclient] moved all javascript into its own file 2018-12-14 16:05:00 +01:00
root 23e17f37ec chg: [querybuilder] added new js dependencies (chosen, query-builder, 
doT, extendext and moment)
 2018-12-14 15:47:41 +01:00
Alexandre Dulaunoy f5af41239e
chg: [misp-galaxy] updated to the latest version 2018-12-13 21:42:58 +01:00
Andras Iklody cfe3841d8d
Merge pull request #3942 from tomking2/2.4 
fix: Make IE11 compliant by adding startsWith polyfill
 2018-12-13 04:52:46 -05:00
iglocska 10557c12da Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-12-13 10:30:40 +01:00
iglocska be05652072 fix: [CLI] usage output fixed for the server shell tasks 2018-12-13 10:30:04 +01:00
iglocska 2ce3bdddbe fix: [sync] Fixed an incorrectly formatted event index output when minimal:1 is passed, breaking the sync pull 
- ffs
 2018-12-13 10:28:58 +01:00
Tom King 1caca3adcc fix: Make IE11 compliant by adding startsWith polyfill 2018-12-13 09:17:29 +00:00
Tom King da3bba7ba8 fix: Make IE11 compliant by removing default param value from ES2015 2018-12-13 09:13:21 +00:00
Tom King 3c2e976997 fix: Make IE11 compliant by removing default param value from ES2015 2018-12-13 09:07:35 +00:00
iglocska a56e1b44b5 fix: [server preview] fixed sharing groups linking to the equivalent ID sharing group on the local instance 2018-12-12 19:26:40 +01:00
iglocska 147ab92aa9 fix: [api] Fixed event index to include sharing group metadata 2018-12-12 19:24:12 +01:00
iglocska ba74597e87 fix: [Restresponse] fixed XML converter 2018-12-12 19:23:40 +01:00
iglocska a2f073e6d1 fix: [compatibility] reverted IE11 breaking change in misp.js, fixes #3939 2018-12-12 17:53:10 +01:00
iglocska fe3bf1f57a fix: [feeds] Fixed an issue that caused a misp format feed fetch to fail intermittently 2018-12-12 17:30:58 +01:00
iglocska d79757ad73 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-12-12 16:01:15 +01:00
iglocska c7a4b6f1f5 fix: [sync] Issue with events not updating on a pull 
- overzealous protection removed
- Conditions blocking an event edit via a pull now rely on the locking mechanism, relaxed via an internal sync link
 2018-12-12 15:58:36 +01:00
Sami Mokaddem ac0db78bc1 chg: [eventView] applied quick-edit button for comment field 2018-12-12 15:38:22 +01:00
Sami Mokaddem 1c8601c0e1 chg: [quickEditHover] change variable scope to local 2018-12-12 15:16:01 +01:00
Sami Mokaddem e076239a0e new: [eventview] value quickedit are triggered by clicking a button 
And no longer using double-click
 2018-12-12 14:45:18 +01:00
Sami Mokaddem 260f75d8c3 fix: [upload_analysis_file] Prevent object creation on non-existing events 2018-12-12 11:16:00 +01:00
Sami Mokaddem 244f62e355 chg: [eventGraph] added fail save if requiredOneOff is not set 2018-12-12 10:28:08 +01:00
Sami Mokaddem 5140ab0b74 fix: [eventGraph] Object's label gets set correctly 
Add both requiredOneOf and required (forgotten one) fields in the Object's label
 2018-12-12 10:25:18 +01:00
chrisr3d dee614b4b8
fix: [stix 1&2 import] Fixed version attribute of the original filename 2018-12-12 10:19:40 +01:00
chrisr3d 12b713af35
fix: [stix2 import] Allowing import of STIX 2.0 documents that have non v4 UUIDs 
- Some further operations may be done on those UUIDs later
- Atm, we (at least) avoid loading errors from the stix2 python library
 2018-12-11 15:50:14 +01:00
Sami Mokaddem 191c1e1715 chg: [querybuilder] injected tags are now injected by name instead of ID (allowing sql LIKE) 2018-12-11 14:54:28 +01:00
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