MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
6,648 Commits
63 Branches
383 Tags
216 MiB
Commit Graph

6648 Commits (67d37a283faab5c95e88cb539743b26c8e2743d6)

Author SHA1 Message Date
Steffen Sauler 89e747da13 Removed duplicates from $categoryDefinitions 
Payload delivery/ip-dst|port
Payload delivery/ip-src|port
Support Tool/text
 2017-10-03 16:10:29 +02:00
iglocska 09dd5b12c0 fix: Fix some restsearch filters fetching the same event more than once 2017-09-29 16:37:24 +02:00
iglocska 6a12f122db fix: Corrected filename for array of events 2017-09-29 16:10:38 +02:00
iglocska 416ff3f095 fix: Sanitise all the things for XML, fixes #2522 
- Sanitise all the things!

─────────────────────────────▄██▄
─────────────────────────────▀███
────────────────────────────────█
───────────────▄▄▄▄▄────────────█
──────────────▀▄────▀▄──────────█
──────────▄▀▀▀▄─█▄▄▄▄█▄▄─▄▀▀▀▄──█
─────────█──▄──█────────█───▄─█─█
─────────▀▄───▄▀────────▀▄───▄▀─█
──────────█▀▀▀────────────▀▀▀─█─█
──────────█───────────────────█─█
▄▀▄▄▀▄────█──▄█▀█▀█▀█▀█▀█▄────█─█
█▒▒▒▒█────█──█████████████▄───█─█
█▒▒▒▒█────█──██████████████▄──█─█
█▒▒▒▒█────█───██████████████▄─█─█
█▒▒▒▒█────█────██████████████─█─█
█▒▒▒▒█────█───██████████████▀─█─█
█▒▒▒▒█───██───██████████████──█─█
▀████▀──██▀█──█████████████▀──█▄█
──██───██──▀█──█▄█▄█▄█▄█▄█▀──▄█▀
──██──██────▀█─────────────▄▀▓█
──██─██──────▀█▀▄▄▄▄▄▄▄▄▄▀▀▓▓▓█
──████────────█▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓█
──███─────────█▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓█
──██──────────█▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓█
──██──────────█▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓█
──██─────────▐█▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓█
──██────────▐█▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓█
──██───────▐█▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓█▌
──██──────▐█▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓█▌
──██─────▐█▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓█▌
──██────▐█▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓█▌
 2017-09-29 12:21:52 +02:00
Andras Iklody ef66752061 Merge pull request #2517 from truckydev/patch-2 
user right update
 2017-09-28 10:24:31 +02:00
truckydev f607398852 user right update 
Make all user access to /attributes/describeTypes.json
 2017-09-27 17:52:36 +02:00
Andras Iklody 63a00df202 Merge pull request #2515 from c-goes/emailregex 
Allow $ in email addresses
 2017-09-27 16:34:00 +02:00
iglocska 343e5b881f fix: Fixed potential double hashing of samples with the encrypt flag 2017-09-27 15:47:29 +02:00
iglocska 36f6c9685d fix: Invalid uuid used in the objectreferences add form 2017-09-27 15:12:45 +02:00
iglocska 63e934824c fix: Fixed an invalid uuid in the object reference 2017-09-27 14:59:10 +02:00
iglocska 616fc0f9a2 chg: If no object ID is set in the URL for adding an object reference, check the payload for the object_uuid 2017-09-27 14:56:21 +02:00
c-goes 49ed85dd4e Allow $ in email addresses 2017-09-27 13:01:14 +02:00
iglocska b658c20b75 fix: Flatten events for the correlation graph 2017-09-26 10:18:04 +02:00
iglocska d8a6712832 fix: Fixed some weird editing issues 2017-09-26 09:23:32 +02:00
iglocska 1154b55e27 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2017-09-26 09:14:49 +02:00
iglocska fd45eed6c4 chg: Added .onion to the TLD list for the complext type tool 2017-09-26 09:14:00 +02:00
Alexandre Dulaunoy 47538a9a98
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2017-09-26 08:52:51 +02:00
Alexandre Dulaunoy 276d5217e2
MISP galaxy added in the feature list 2017-09-26 07:50:18 +02:00
Alexandre Dulaunoy e7e12dcc6c
MISP objects added 2017-09-26 07:42:58 +02:00
iglocska ec8d283ff5 fix: IP|Port in Gui, fixes #2505 2017-09-25 15:24:58 +02:00
iglocska 9e71fbb5f7 fix: flatten the events for the restSearch API's lookup functions 
- otherwise valid events that only contain objects get blocked
 2017-09-25 14:00:17 +02:00
iglocska a61b5007cf fix: Fixed an issue with pushing a sample via the API / add attachments when no object templates are loaded 2017-09-25 13:08:26 +02:00
iglocska 3b6a6f6e5f Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2017-09-25 12:37:11 +02:00
iglocska 3f76fd6ea7 new: Rework of the attachment uploader 
- add attachments and upload_sample now share code
- allow the same features via upload_sample (object creation / use of advanced add attachments)
- new flag: advanced

- example:

  POST to mymisp/events/upload_sample
  BODY:
{"request":{"files": [{"filename": "bla.exe", "data": "U3RhckNyYWZ0IElJIGZvcmV2ZXI="}], "distribution": 1, "advanced":1, "info":"bla"}}

- this commit was brought to you by CEF and

MMMH$= -  .,   ,,.          %H++  ,= %%$$$$X+ ;=== .=  :+HHHMMMHMMM####MMH@@@@@@HHH$=      HHH@HHHHH+XXX$$$$$$$$XXXXXXX+
MMH = -.  . ,-,,-,.         :H@H  =;;++$HH+XX$%+X%+$++=:=.XH@@@HMMMMMMMMH@@@@@@@HHX$   ,X@@@@@@@HHHHHHHHHHXXXXXXXXXXXXXX
  . ---,  -    ,,,            +@ .. ;++$HH+HHH++$+++HH+++, .+%HHMHHHHHHHHH+%%%++++$+   +++HHHHHHH+++++++++HHHHHHHHHHHHHH
- -- ,,,  --,. -                 , ,; +$XHH@@@@HHH@@@HHHH+$+$X+HH+$$+ ;  ;=  .    %   +  ,+$X+++XXXXXXXXXXXXX++HH+++++++
---==,,--,-,-., :     .          -,,:/ $XHH@HMMMMMMMMMM@HHX$H@MHHHHX+H%%$%+H/:.%. $. @,,,. $$XXXXXXXXXXXXXXXXXXXXXXXXXX+
  =  - --,,   , --   ..             =/ +$+H@@HMMMMMMMMH+H+++HHHHHHHH@+++++H+X++X+$$  = ,,, - $$XXXXX$$$$X$$$$$$$$$$$$$$X
====== --,,,, ,= =              ,==== ++$$+HHMMM####MH+$$+++HH@+HH@MHMMH@@H@@@HH+$+    ,,, ,. $$+$++$$$$$$$$$$++$$$$$$$X
 :==-===-,. ,., ==   .           :;; +++%$+H@HMMMMMMM%$%$$$+H@@+HH@MMMMMM@@@@HHH++H. .,,-,,--=/+$$%%%%%%%%$+%%$$$$$XXXXX
,  =  ==- -  .  ==             . =; ++++%++HHHHHHHHHH++%$$X+@@H+HHHMMMMMMHH@@@+X+    , ,,,,-  , ,$$$$$$$+++++$$$$XXXXX$$
,,-       ,    --=    ..       . ;/ ++++%$X+HHHHHHH  ++$++X+HH+X+H@HMMHHHHHHHH+.       ,,  ,,  , .    +$$$$+%+$$$$$$$$$$
,-----=-=--,   ,==             ..;/ +% +%$XX+HH++HH+/+$%++H@@HHXHHH@@@@@@@@HXX  .   .,,,.  ,,,,     ,-=$$$$$$$$$$$$$$$$$
 - ,- --  -,   ,-=     .         =/++%++%+++++XXXXX$$+.  +HHH@+$XHHHHHHHHH++$        -,,,  ,,      ,,,.   ,+$$$$$$$$$$$$
 ---,-----, .   ==               =/+%+++%++$$+++$X$$$$++,$$+++XXHHHHHHHH+X$+%       ,-,-,        ,,    .  .  ,+$$+++++++
== --, -- =--, ,,=          .    ./++$$++$+X$+/++$$XXXX$$$$XXXXXXH+HH+H+X$%%/     .,,,,,,    ..  ..    ,. ,,,-=+%+++ /++
+   -- -  -,,-  .,    .  . .      = +$$++++HH+.  ,+$$+++++++$XX$X$XHHH+X$$+      ..--,-    .. .        .    ,-, = ======
MH - ---- --,,,    .       .. ,      %++$$X++++ +%++++++++%++$$$$$+H++X$$+        --,    .         .   .        =  .====
MM=,-, ---,,,,,    . .     ...,,,   =/++%$$XXXX+/+++@@H@HX$+%$$+HHHHH$$$+:       ,--    .     ,. ..       .. ==::;=-:;;;
MM+ ,----,,,,              , .. ,.      +++X+HH+++++%++$++++$$+HHH+++$$          ,-          ,   .       .   : ;/ +%+.
MMH ,-,-,, ,,.        .    -,     =     = +$+H@HH++++$$X$$+++HHH+++$                       ,    ..       ,  +++++++%%+%+
MM@,--,-,,,,,. .     ,,     .    ,-,    .=+$XHHHXXHHHHHHHH@@@@HX$%+:          ,, .      ..,,  .....    ...%%%%++%%%%%%%%
M@@== ,,,  ,                               ++++XX++HHHHHH++HHH+,              ,         ,  .  ....     . +$+%%%%%%+%%%%%
H@H+=,,,  ..                                  ,,+%$+H@HHHXX++,               ,         ,,  .  ...   . ,$$$$$%%%%%+%+%%%%
@H+,-,,.....       .                          .,.;; ++$$X+%+:-              ,  .     .,,,  .  ...   . XXX$$$%%%%%%+%%%%%
+++ -, . ...                             .  .======== === ,                          ,, . .  ..   . -,XXX$X$+$+%%%%%%%%%
$+     .                                ===:; ++++ ++++-,.  ,                       ,-,          .  $X+XX+XXX$$+%++%%%%%
++: ,. .                         ,-,,-==:; %%%%%+%$$%$$X$$$+%+:==        .        . ,,           ..+X$XXXXXX$$$+%%$$%%%%
=:                              ,,,  ==   ++++++$+$$%+++$$$++$+ . ==     .        .,,,             +$$$$$$$$$$$$$$+$%%%+
 ,                          ,---, =:;/++$$XX$$$$$$X+H@H@HHH$%%%$X$++;===== .      .,            .. +%%+$++$%$$$$$$%%++%+
                               ===; +++$$$$+ +%+++%+HH@@@@HH+++ ++%+$+,  ===      ..             ,=;   +++++++++..   :;;
                      .   =:;   /++%$$++,  ,++HHMMHH@@@@HHHH@HH++++++ ,+$$+ .     ..                :=;;:;;;;;==========
                  .,,-==;;;+%  %%+$$$$ /+++@@@@@@@@@@HH@M@MH@@@HHHHH$$% /%$XXX$X  .                -=====::::=========::
                .    =;  ++++++$+++  , +%H@@@HHH@HH++HHH@MHHH@HHHHHH++++ , +%%+$                    ,, -       --- ==:=:
               ====;    ++++$$+%  ++H@HHHHHHH+X++X++@@@HHH@MMMMHHHHHH@HHHH+++++.                        ,,,,-,--- =:==;;
     .,., ==;// / ++++%+%+%+++$$+@H@@@@H@HHH+XXX$%+HHHH@@HH@HMMMMMMMMMMMMMMH@+%;                       ...,,,,,--==;;;/;
 .  ...=    .,+%$++%+$XXX$++%+++H@@@@HHH@HHH+++.   ++++H+HHHHHHHMMMMMMMMMMMM@++:                            ,,, ===;;;;;
==: .  ++++++++HH%H+++X++HH+H@HHHH@HHHHHHH+++++%++%%+%%++ . ,   = ++$H@@HMHMMH%=                                .  ..,,=
+++%$XXHHHHHH@H@@@@@H@HH@MMM@@HH@HH+HXH@HH%%+HH+XX$$$+++/;:=== ,,,,,, = ::; % :,                                   ...,,
%+++HHH@HHH@@HMHHHH@HHHMHMHHHHHH+XH+HHH++++HHHH@HHHHH++%+ -,  = ,=== ,,  ,,, .
H@HHHH#M#M#MHHHM#MMMMMMMHHHH@H@H++@H$+++HHM#MMMMHMMH@@HHHHHH%+++++%%%+++    ,  .
%%%%%%%%%%%%%%++++%%++   ..   ...  ..  .                                   +++%+++++++%++++%+++++++++%+%++%+%%++%++++++%
 2017-09-25 12:22:19 +02:00
Andras Iklody 501206ac7e Merge pull request #2502 from aparriel/tag_on_attribute_restSearch 
Fix Tag json format
 2017-09-22 15:43:32 +02:00
Alexandre Parriel dcc0393c6b Fix Tag json format 2017-09-22 15:36:41 +02:00
Andras Iklody b524925e8b Merge pull request #2495 from arnydo/2.4 
new: added alternate nameserver option to rpzexport
 2017-09-21 17:12:38 +02:00
arnydo 20ff380e17 move ns_alt parameter to end of api list 2017-09-21 11:11:30 -04:00
iglocska 217a047564 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2017-09-21 12:12:40 +02:00
iglocska 3ba6636bd5 new: change server settings via the API 
Usage:

Viewing current setting value:

GET /servers/serverSettingsEdit/[mysetting]
Accept: application/json
Content-type: application/json
Authorization: [mykey]

Altering setting value:

POST /servers/serverSettingsEdit/[mysetting]
Accept: application/json
Content-type: application/json
Authorization: [mykey]
Body: {"value":"My new value"}

As a reminder, get all settings and diagnostics via:

GET /servers/serverSettings/download
Accept: application/json
Content-type: application/json
Authorization: [mykey]
 2017-09-21 12:10:22 +02:00
Andras Iklody 87f0673da8 Merge pull request #2500 from aparriel/tag_on_attribute_restSearch 
Add Tag field for restSearch on attributes, Fixes #2497
 2017-09-21 10:36:02 +02:00
Alexandre Parriel 164a94fc49 Add Tag field for restSearch on attributes, Fixes #2497 2017-09-21 10:25:11 +02:00
Andras Iklody 54df7b9259 Merge pull request #2498 from Rafiot/travis3 
fix: travis file
 2017-09-20 17:18:20 +02:00
iglocska 6d11f1eecc new: Allow POSTing search parameters to the /tags/index API 
- to filter the tags index simply POST to /tags/index the following payload:

{"filter": "malware_classification:malware-category"}
 2017-09-20 17:13:33 +02:00
Raphaël Vinot 5a462cf502 up: Bump PyMISP 2017-09-20 16:04:36 +01:00
Raphaël Vinot 85d0ef525e up: test file 2017-09-20 15:57:48 +01:00
iglocska 12b1c354fa fix: Fixed a bug where normal users couldn't add object references 
- as reported by @deralexxx
 2017-09-20 16:53:54 +02:00
iglocska 1770a501ab fix: Added ObjectTemplateElements to the objectTemplate view via the API 2017-09-20 15:47:46 +02:00
iglocska 2864b01386 fix: only lower case search terms work in tags/index's filter 2017-09-20 15:43:19 +02:00
iglocska da573e6ee9 fix: Port added to network activity 2017-09-20 15:40:16 +02:00
Kyle Parrish c5d3ae7b1f RPZExport - Alternate NS 
Added option to add an alternate nameserver to RPZ export.
 2017-09-19 13:25:17 -04:00
iglocska b5c4d0749b new: Added object relations to the CSV export 2017-09-19 16:50:56 +02:00
iglocska b526a437d7 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2017-09-19 15:50:35 +02:00
iglocska 09dfb7aa14 fix: Reverted CakePHP version 2017-09-19 15:50:19 +02:00
Andras Iklody 81cdcd356b Merge pull request #2493 from RichieB2B/patch-2 
Use sanitized orgname in STIX header
 2017-09-19 13:44:42 +02:00
Richie B2B 83dce8191e Use sanitized orgname in STIX header 2017-09-19 13:40:08 +02:00
iglocska ecda724315 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2017-09-19 12:05:46 +02:00
iglocska 76ec7f1c10 fix: Fixed the XML view 
- please stop using XML, for your own sanity, I beg of you!
 2017-09-19 12:05:21 +02:00
Andras Iklody 248c364745 Merge pull request #2490 from ealtintas/2.4 
Update README.md
 2017-09-19 11:30:00 +02:00
Ergin ALTINTAS 080b1f8a56 Update README.md 
Fix the typo: "Network Detection Intrusion System" -> "Network Intrusion Detection System"
 2017-09-19 11:35:21 +03:00