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

21137 Commits (48e13a9ee7f9dd497d5649297879f49f30613d62)

Author SHA1 Message Date
Raphaël Vinot c44e4f198e
chg: [Python] Use pymisp from pypi. 2021-12-20 13:25:51 +01:00
chrisr3d f796071d64
Merge branch 'develop' of https://github.com/MISP/MISP into develop 2021-12-20 12:05:42 +01:00
chrisr3d 7ebf3818d3 Merge branch 'misp-stix' of https://github.com/MISP/MISP into 2.4 2021-12-20 11:35:34 +01:00
chrisr3d bb1d27bcaa Merge branch '2.4' of https://github.com/MISP/MISP into misp-stix 2021-12-20 10:55:33 +01:00
Alexandre Dulaunoy 4854523e23
chg: [misp-galaxy] updated 2021-12-20 10:45:19 +01:00
Alexandre Dulaunoy 421d23d1a1
chg: [misp-galaxy] updated to the latest version 2021-12-20 10:32:09 +01:00
iglocska b2343fc95d
Merge branch '2.4' into develop 2021-12-18 17:32:52 +01:00
iglocska 3b31026d27
chg: [backwards] compatibility 
- reverted a strict typed function parameter check to appease the legacy gods
 2021-12-18 17:31:02 +01:00
chrisr3d 2f4fb126f8
add: [stix1 export] Supporting specific framing for attributes collections export 2021-12-17 23:43:22 +01:00
Steve Clement 4ffc8aa8d4
chg: [installer] Update to latest version 2021-12-18 01:30:20 +04:00
Steve Clement 633f93e6bd
Merge pull request #8037 from SteveClement/guides 
chg: [doc] Minor error on rhel version
 2021-12-18 01:30:02 +04:00
Steve Clement 55d1988e96
chg: [doc] Minor error on rhel version 2021-12-18 01:28:09 +04:00
Jakub Onderka b05c4f90a9
Merge pull request #8027 from JakubOnderka/cli_authkey_valid 
new: [CLI] user authkey_valid command
 2021-12-17 18:02:42 +01:00
Jakub Onderka 39ff758ba5
Merge pull request #8025 from JakubOnderka/predicatable-tag-color 
new: [tag] Generate predictable tag color
 2021-12-17 18:02:22 +01:00
Jakub Onderka d9cc0e8205
Merge pull request #8028 from JakubOnderka/json-convertor-static 
chg: [internal] Make JSONConverterTool method static
 2021-12-17 18:02:05 +01:00
Alexandre Dulaunoy 521ebd78b1
chg: [misp-galaxy] updates 2021-12-17 16:34:24 +01:00
Alexandre Dulaunoy 48f3b2ab79
chg: [misp-galaxy] updated to the latest version 2021-12-17 16:23:27 +01:00
iglocska 975a15ab1c
Merge branch 'sync_filter' into develop 2021-12-17 16:09:54 +01:00
iglocska 1c5d7d2f2f
chg: [rephrasing] some warnings 2021-12-17 16:09:01 +01:00
Alexandre Dulaunoy 880709b91b
Merge branch '2.4' of github.com:MISP/MISP into develop 2021-12-17 15:41:35 +01:00
Alexandre Dulaunoy 1444724dfb
chg: [warninglists] updated 2021-12-17 15:39:30 +01:00
Sami Mokaddem 4a43ddc129
chg: [server:edit] Display object name for both sync mechanisms 
Even though I said I won't do it
 2021-12-17 15:36:04 +01:00
Sami Mokaddem f6038f9cc8
Merge branch 'develop' of github.com:MISP/MISP into feature-sync-type-filtering 2021-12-17 15:24:56 +01:00
Sami Mokaddem 0f77454876
fix: [event:push] Unset attribute before processing it and nesting typo 2021-12-17 15:24:35 +01:00
Sami Mokaddem 7f53cdc562
fix: [server:pull] Typo in objectAttribute filtering 2021-12-17 15:23:37 +01:00
Alexandre Dulaunoy 6246fcd945
chg: [pip] unused and broken Pipfile.lock (old conflict merged) 2021-12-17 11:42:49 +01:00
Alexandre Dulaunoy 6af6a4ea1a
chg: [pip] unused and broken Pipfile.lock (old conflict merged) 2021-12-17 11:41:00 +01:00
Sami Mokaddem 5cdc0cc7a7
chg: [app] Bumped query version 2021-12-17 11:38:34 +01:00
Sami Mokaddem 042e1b296a
fix: [tools:timeline] Usage of correct UUID and disabled polling extrapolation 
This half baked feature was making thing confusing for the users. If we ever need it implemented it should be something more robust and configurable.
 2021-12-17 11:36:41 +01:00
Sami Mokaddem 934f94ee90
chg: [event:timeline] Fit timeline after initial load 2021-12-17 11:34:51 +01:00
Steve Clement f132a6b497
Merge branch '2.4' into develop 2021-12-17 11:07:52 +04:00
Steve Clement 559d879c14
chg: [installer] Update to latest version 2021-12-17 11:06:55 +04:00
Steve Clement 28259ac3ef
Merge pull request #8035 from SteveClement/guides 2021-12-17 11:05:43 +04:00
Steve Clement 5561053e25
chg: [doc] endpoint.com is now enpointdev.com 2021-12-17 10:59:08 +04:00
chrisr3d 45822a8fe3
fix: [misp-stix] Bumped latest version with up-to-date dependencies & requirements 2021-12-16 17:30:01 +01:00
Sami Mokaddem 3ca751c812
chg: [server:edit] Include the object name in addition to the template UUID for PUSH 
The name of the object could be unknown by the instance for PULL so we keep it on the old behavior.
 2021-12-15 16:10:42 +01:00
Hendrik Baecker 83c08362b9 [chg] Establish 'mixedauth' 
mixedauth=false: Only query LinOTP for OTP (or OTP-Pin+OTP Value)
mixedauth=true: Use MISP Userbase for Passwordchecking AND LinOTP for second factor

mixedauth=true will throw exceptions if OTP doesn't match to not fall back
to FormAuthenticate from MISP - which would get the 2FA useless.
 2021-12-15 12:48:44 +01:00
Hendrik Baecker f5eb5828bf [chg] Extract otp from request 2021-12-15 12:45:41 +01:00
Hendrik Baecker e58e4f712a [chg] Fix typos 2021-12-15 12:45:04 +01:00
Hendrik Baecker fecba0beec [chg] Adjust handling LinOTP response 2021-12-15 12:44:37 +01:00
Jakub Onderka f9eeeed4fe chg: [internal] Make JSONConverterTool method static 2021-12-14 22:35:50 +01:00
Jakub Onderka ff59dde3f8 new: [CLI] user authkey_valid command 2021-12-14 21:00:47 +01:00
Hendrik Baecker e2cd8ba8b1 [chg] Add OTP Form Field if LinOTP active 2021-12-14 17:52:25 +01:00
Hendrik Baecker efae024bc7 [chg] added LinOTP to configs 2021-12-14 17:47:07 +01:00
Hendrik Baecker edf6bd41b7 [chg] no more php-curl but cake socket 2021-12-14 17:42:43 +01:00
Hendrik Baecker 2a54c429ed [chg] Safe LinOTP Config 2021-12-14 17:28:52 +01:00
chrisr3d f5528f8522
chg: [misp-stix] Bumped latest version 2021-12-14 16:51:07 +01:00
Jakub Onderka 6b248b179f new: [tag] Generate predictable tag color 2021-12-14 09:24:24 +01:00
chrisr3d 9c76b9ecfa
fix: [stix export] Added parameters to the temporary files deleting function 
- Can delete output files when we get an exception
  from the python scirpt
- Can delete a specific list of files that are not
  suffixed with a '.out' extension, like it is the
  case for attributes collections export as STIX 1
 2021-12-14 01:54:18 +01:00
chrisr3d bcb6f8d5e3
fix: [stix export] Removed unused variables 2021-12-14 01:53:44 +01:00