MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
14,607 Commits
42 Branches
370 Tags
181 MiB
Commit Graph

14607 Commits (d48a013f3a06c740a03ac16cdd4e256f2f0763c7)

Author SHA1 Message Date
Jakub Onderka 5391611d75
fix: [log] Proper format log message for reset auth key 
In future, it will be also possible to filter auth keys in logs.
 2020-01-27 16:58:46 +01:00
mokaddem eb9b60032e
fix: [objects:edit] Added *_seen validation and error reporting 2020-01-27 16:29:28 +01:00
mokaddem 04a5d2a31f
Merge branch 'pr-5295' into 2.4 2020-01-27 12:50:00 +01:00
mokaddem 0f6990421b
chg: Changed error messages into translatable strings 2020-01-27 12:47:15 +01:00
Andras Iklody cc9c0ee207
Merge pull request #5555 from JakubOnderka/patch-76 
fix: [CLI] Die if setting name is not correct
 2020-01-27 12:35:34 +01:00
mokaddem 13499737a5
Merge remote-tracking branch 'origin/2.4' into pr-5295 2020-01-27 11:47:24 +01:00
mokaddem 893a3326ac
fix: [server:edit] Correctly escape `%` re-enabling server setting editing 2020-01-27 11:21:18 +01:00
Jakub Onderka c4db35bbf8
fix: [CLI] Die if setting name is not correct 2020-01-27 10:12:36 +01:00
Andras Iklody 56e0d009e7
Merge pull request #5541 from JakubOnderka/proper_logout 
fix: Proper logout when `CustomAuth_custom_logout` is set
 2020-01-27 07:56:52 +01:00
Andras Iklody cb952e8f2e
Merge pull request #5553 from ZeroDot1/patch-1 
Fix the CoinBlockerLists
 2020-01-27 07:55:25 +01:00
ZeroDot1 f47092a588
Fix the CoinBlockerLists 
Delete the MiningServerIPList.txt feed because the feed is no longer available. 

All current downloads can be found via the CoinBlockerLists homepage.
https://zerodot1.gitlab.io/CoinBlockerListsWeb/downloads.html

Thanks to everyone for using the CoinBlockerLists, I appreciate it very much.

' 
{
    "Feed": {
      "id": "68",
      "name": "This list contains all IPs - A additional list for administrators to prevent mining in networks",
      "provider": "CoinBlockerLists",
      "url": "https://gitlab.com/ZeroDot1/CoinBlockerLists/raw/master/MiningServerIPList.txt?inline=false",
      "rules": "",
      "enabled": true,
      "distribution": "3",
      "sharing_group_id": "0",
      "tag_id": "0",
      "default": false,
      "source_format": "freetext",
      "fixed_event": false,
      "delta_merge": false,
      "event_id": "0",
      "publish": false,
      "override_ids": false,
      "settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
      "input_source": "network",
      "delete_local_file": false,
      "lookup_visible": true,
      "headers": ""
    }
  },
'
 2020-01-26 23:00:56 +00:00
Jakub Onderka fd4588154a fixup! chg: [user] GPG key fetching by server 2020-01-26 19:28:04 +01:00
Andras Iklody b50bc00ac6
Merge pull request #5548 from JakubOnderka/patch-75 
fix: `DefaultRoleId` is not implemented for ApacheShibbAuth
 2020-01-26 12:58:28 +01:00
Jakub Onderka 6f212dd97c
chg: [UI] Resizing images 2020-01-24 10:58:01 +01:00
mokaddem d16369f4b3
Merge branch '2.4' of github.com:MISP/MISP into pr-view_picutre 2020-01-24 10:42:35 +01:00
mokaddem 0c68bc7de7
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-01-24 10:31:02 +01:00
mokaddem 032e805f2e
fix: [ui:galaxy] Correctly display galaxy info 2020-01-24 10:30:08 +01:00
Sami Mokaddem 6d361bb551
Merge pull request #5542 from JakubOnderka/patch-74 
fix: [UI] Remove double escaping
 2020-01-24 10:28:13 +01:00
Alexandre Dulaunoy 2b2b7f91d2
chg: [misp-galaxy] updated to the latest version 2020-01-24 09:30:03 +01:00
Jakub Onderka 8c2bdf6d56
fix: `DefaultRoleId` is not implemented for ApacheShibbAuth 2020-01-24 09:26:37 +01:00
Jakub Onderka e0d4dd70e1
fix: [UI] Remove double escaping 2020-01-23 18:35:37 +01:00
Jakub Onderka a3c07277c4 fix: Proper logout when `CustomAuth_custom_logout` is set 2020-01-23 16:46:02 +01:00
mokaddem 7d9600c81d
Merge branch '2.4' of github.com:MISP/MISP into pr-patch-67 2020-01-23 15:58:30 +01:00
mokaddem e3229c423e
Merge remote-tracking branch 'origin/2.4' into pr-selective_import_v2 2020-01-23 14:58:19 +01:00
mokaddem 1e49cc6aab
fix: [attribute:search] Unset filtering rules on *_seen if unset 2020-01-23 14:14:14 +01:00
mokaddem 0b1c71e1d9
chg: [dbschema] Pretty print db_schema and removed Object.comment and 
ShadowAttr.comment from the index list
 2020-01-23 11:48:47 +01:00
iglocska f88743cb7a
fix: [internal] slight tuning to the attribute restsearch memory envelop size 2020-01-23 09:45:27 +01:00
iglocska 2989d5d653
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-01-23 09:44:12 +01:00
iglocska 6d76550ea6
new: [sync] Add additional pull filters to the sync, fixes #5510 
- uses the same format as the index filters
 2020-01-23 09:42:16 +01:00
mokaddem 4100af2a30
chg: [console:server] Stop execution if user does not exists 2020-01-22 16:07:59 +01:00
mokaddem 6c5c5855c5
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-01-22 09:13:17 +01:00
mokaddem 138d50c2bd
fix: [diagnostic:dbSchema] Updated schema with the Attribute.comment 
indexing change nad pretty-printed it
 2020-01-22 09:12:26 +01:00
Andras Iklody 63c826d4f6
Merge pull request #5530 from legoguy1000/2.4 
Add SAML (Shibboleth) login button
 2020-01-22 08:54:33 +01:00
Alex Resnick 6974ec788a
Add SAML (Shibboleth) login button 
With Shibboleth and SAML you have 2 options, for SAML login and don't allow local login or allow both.  The example in the documentation forces (requires) SAML authentication and thus doesn't allow you to use local credentials if needed.  This adds a button below the login form to redirect to the Shibboleth login page if using passive Shibboleth auth.  To use passive auth set "ShibRequestSetting requireSession 0/false" instead of "ShibRequestSetting requireSession 1/true"
 2020-01-21 19:41:42 -06:00
Andras Iklody beb0547ab2
Merge pull request #5527 from JakubOnderka/patch-72 
fix: [UI] Add space after ':' in error text
 2020-01-21 17:03:26 +01:00
Jakub Onderka 05ef9c03d2
fix: [UI] Add space after ':' in error text 2020-01-21 16:38:43 +01:00
Sami Mokaddem c628375e96
fix: [serverShell] Stopped usage of reserver keyword 
Renamed function name to let PHP 5.x parse the shell script correctly
 2020-01-21 14:05:22 +01:00
Alexandre Dulaunoy 2b9acdadae
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-01-21 09:48:19 +01:00
Alexandre Dulaunoy 270041050f
chg: [PyMISP] update to the latest version 2020-01-21 09:47:54 +01:00
Alexandre Dulaunoy 42f106610b
chg: [attributes] new attribute type 'chrome-extension-id' 
This attribute is used by Chrome to uniquely identify extension.
 2020-01-21 09:40:25 +01:00
Steve Clement 66ab917451
fix: [install] Update .sfv 2020-01-21 17:23:31 +09:00
Steve Clement 0f370f1f7f
fix: [stix2] Fix stix2 for the Docs and Installer (#5526) 
fix: [stix2] Fix stix2 for the Docs and Installer
 2020-01-21 16:54:53 +09:00
Steve Clement d2e6538653
fix: [tools] re-generated INSTALL.sh fixed small issue in ubu 2020-01-21 15:11:18 +09:00
Steve Clement fe901fbaa3
fix: [stix] small fix to get around a current cti-python-stix2 glitch (to be undone) 2020-01-21 14:29:30 +09:00
mokaddem ddd75c1460
fix: [form_seen] Filling *_seen field with no value remove the *_seen time 2020-01-20 16:27:00 +01:00
mokaddem 60143aba44
chg: [timeline:display_threshold] Increased display threshold 2020-01-20 15:48:26 +01:00
mokaddem d75de2b603
fix: [worker:diagnostic] Prevent failing if no worker are running 2020-01-20 14:52:13 +01:00
mokaddem 25694be01a
chg: [worker:diagnostic] typo 2020-01-20 13:49:46 +01:00
mokaddem 4a6edd20fb
fix: [workers:diagnostic] Consider a queue to be healthy if one worker is running 2020-01-20 13:49:09 +01:00
mokaddem 67971f532b
fix: [adminSetting] Avoid trying to create new entries if previous save failed 2020-01-20 13:26:25 +01:00