MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
21,120 Commits
34 Branches
364 Tags
187 MiB
Commit Graph

16798 Commits (9cff98016d902b5c310084520907c518562b9bf0)

Author SHA1 Message Date
chrisr3d 924dd08cdb Merge branch 'misp-stix' of https://github.com/MISP/MISP into develop 2021-12-22 14:25:16 +01:00
chrisr3d 576f0ff9d5
chg: [misp-stix] Bumped latest version of the library 2021-12-22 14:24:25 +01:00
Alexandre Dulaunoy 43d1fb8ad9
Merge pull request #8047 from RichieB2B/ncsc-nl/sightings-dist 
Fix typos
 2021-12-22 14:03:01 +01:00
Richard van den Berg 2e303024bf fix: [event:checkDistributionForPush] typos 2021-12-22 13:55:46 +01:00
Andras Iklody 22576b81ba
Merge pull request #8046 from RichieB2B/ncsc-nl/sightings-dist 
Use Event model for Sighting context
 2021-12-22 13:11:17 +01:00
Richard van den Berg 7b627037d7 fix: [event:uploadEventSightingsToServersRouter] use Event model for Sighting context 2021-12-22 13:05:55 +01:00
Andras Iklody ec07811aed
Merge pull request #8045 from RichieB2B/ncsc-nl/sightings-dist 
Allow sightings to be pushed upstream
 2021-12-22 13:02:51 +01:00
iglocska b0cd5495cb
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-12-22 13:01:05 +01:00
iglocska 76a0f0617a
chg: [security audit] fixed failures on kernel compilation time 
- currently the check makes a lot of invalid assumptions, made it more lax to fail gracefully
 2021-12-22 13:00:12 +01:00
Richard van den Berg c7cf1e7be3 fix: [event:uploadEventSightingsToServersRouter] allow sightings to be pushed upstream 2021-12-22 12:11:22 +01:00
chrisr3d 7da4deba07
fix: [stix1 export] Ordering object types to avoid validation issues 
- STIX validator seems to dislike `Observables`
  objects coming after `Indicators`, so we put
  the object types in the order they are presented
  in the documentation
 2021-12-22 11:46:48 +01:00
Raphaël Vinot df84346bb2 chg: [PyMISP] Bump version 2021-12-22 11:14:21 +01:00
iglocska f905eef8f0
Merge branch '8042' into develop 2021-12-21 16:42:50 +01:00
Sami Mokaddem 1434e02075
fix: [server:add] Pass the correct variables to the view 2021-12-21 16:08:59 +01:00
Hendrik Baecker 12ba2981ef LinOTP: nitpicking and failsafe 
Also one CodeFactor fix
 2021-12-21 15:59:55 +01:00
Hendrik Baecker 8964a36b39 [chg] Ensure 'false' if LinOTP Request fails 2021-12-21 13:48:02 +01:00
Alexandre Dulaunoy ee4648d3c6
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-12-21 07:58:59 +01:00
Alexandre Dulaunoy 5e69040b66
chg: [misp-objects] updated to the latest version 2021-12-21 07:57:55 +01:00
chrisr3d f796071d64
Merge branch 'develop' of https://github.com/MISP/MISP into develop 2021-12-20 12:05:42 +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
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
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
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