CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2026-04-25 14:07:49 +02:00
Code Issues Packages Projects Releases Wiki Activity
7,781 Commits 40 Branches 125 Tags
108fb1261233c84186b4f2ea1fc23dd7222216f4
Commit Graph

7781 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Ertel 5e042bf4b8 Improve algorithm for determining if a user sync is necessary; Apply salt state in foreground to avoid collisions with setup salt states. 2021-06-21 12:16:47 -04:00
Josh Brower 130ce34686 Merge pull request #4578 from Security-Onion-Solutions/fix/esAlerter 
esalerter ES creds fix
 2021-06-21 11:08:59 -04:00
Josh Brower 591ef540a6 esalerter ES creds fix 2021-06-21 10:50:09 -04:00
Josh Patterson 697f6ab538 Merge pull request #4577 from Security-Onion-Solutions/issue/1333 
remove the salt-minion check for schedules
 2021-06-21 09:05:18 -04:00
m0duspwnens ba5b5db2c4 remove the salt-minion check for schedules 2021-06-21 08:56:24 -04:00
Jason Ertel e7afbab6a1 Merge pull request #4576 from Security-Onion-Solutions/kilo 
Fix intermittent 'like' failures; Ensure bash is on first line of loa…
 2021-06-21 07:09:10 -04:00
Jason Ertel 5298cb8cfb Update copyrights 2021-06-21 07:06:49 -04:00
Jason Ertel 777bece2eb Fix intermittent 'like' failures; Ensure bash is on first line of load templates script 2021-06-20 22:14:13 -04:00
Mike Reeves 7daad1a52a Merge pull request #4571 from Security-Onion-Solutions/kilo 
Ensure htpasswd exists earlier in the install process
 2021-06-18 21:45:29 -04:00
Jason Ertel 60fd3c6bd3 Ensure htpasswd exists earlier in the install process 2021-06-18 20:01:32 -04:00
Josh Patterson dc1c82f347 Merge pull request #4567 from Security-Onion-Solutions/issue/1333 
Issue/1333
 2021-06-18 16:12:42 -04:00
m0duspwnens c7a58816b6 move condition to avoid wrong notic about schedule not set in pillar 2021-06-18 15:30:51 -04:00
m0duspwnens 48c3cb4816 if the salt-minion service isnt running when the state is rendered, dont try to apply schedule - https://github.com/Security-Onion-Solutions/securityonion/issues/1333 2021-06-18 14:56:01 -04:00
Jason Ertel 6e7f2107cb Merge pull request #4566 from Security-Onion-Solutions/kilo 
Remove unused mode
 2021-06-18 14:45:02 -04:00
Jason Ertel 101b835cf6 Remove unused mode 2021-06-18 14:34:42 -04:00
Jason Ertel 558a90aaf8 Merge pull request #4563 from Security-Onion-Solutions/kilo 
Disable HaveIBeenPwned API (pwnedpasswords.com)
 2021-06-18 08:41:23 -04:00
Jason Ertel 1d4161ba31 Disable HaveIBeenPwned API (pwnedpasswords.com) 2021-06-18 08:36:36 -04:00
Mike Reeves 78d53af27c Merge pull request #4562 from Security-Onion-Solutions/kilo 
Fix wrong grep file
 2021-06-17 21:19:05 -04:00
Jason Ertel 188b4424e4 Fix wrong grep file 2021-06-17 21:00:56 -04:00
Mike Reeves 0615d635eb let the first highstate pass 2021-06-17 16:12:39 -04:00
Jason Ertel 833559dde6 Merge pull request #4559 from Security-Onion-Solutions/kilo 
Kilo
 2021-06-17 15:55:28 -04:00
Jason Ertel b294cee278 Remove passwords from soctopus templates since these are the basis for elastalert rules, which will use the user/pass at the elastalert global config level 2021-06-17 15:53:07 -04:00
Jason Ertel afe7ddb480 Remove passwords from soctopus templates since these are the basis for elastalert rules, which will use the user/pass at the elastalert global config level 2021-06-17 15:51:53 -04:00
Jason Ertel 98526af82a Merge pull request #4558 from Security-Onion-Solutions/kilo 
Lock so-user to avoid two processes from overwriting eachother
 2021-06-17 15:23:42 -04:00
Jason Ertel 0cb4562254 Lock so-user to avoid two processes from overwriting eachother 2021-06-17 15:19:39 -04:00
Josh Patterson 70f0ee719c Merge pull request #4557 from Security-Onion-Solutions/fix_soup_elasticcurl 
Fix soup elasticcurl
 2021-06-17 15:02:27 -04:00
m0duspwnens 63b120e9e2 use just curl for elastic in soup 2021-06-17 14:56:05 -04:00
m0duspwnens d587120613 set ELASTICCUURL default as curl 2021-06-17 14:42:04 -04:00
Josh Patterson 79aad225a4 Merge pull request #4552 from Security-Onion-Solutions/kilo 
Kilo
 2021-06-17 09:38:41 -04:00
m0duspwnens 8cd2bc7c13 adding so-eval to ES_INCLUDED_NODES 2021-06-17 09:37:21 -04:00
m0duspwnens 2a5198cae4 change perms to resolve error about module-setup.yml being 660 2021-06-17 08:49:21 -04:00
Jason Ertel b8c463db82 Merge pull request #4551 from Security-Onion-Solutions/kilo 
Fix require statement
 2021-06-16 21:49:47 -04:00
Jason Ertel 059b016c62 Fix require statement 2021-06-16 21:48:31 -04:00
Jason Ertel f1429632d2 Merge pull request #4549 from Security-Onion-Solutions/kilo 
Elastic auth: Fun with Salt
 2021-06-16 17:57:58 -04:00
Jason Ertel 2d34208269 Elastic auth: Fun with Salt 2021-06-16 17:52:22 -04:00
Jason Ertel 36c9054744 Merge pull request #4547 from Security-Onion-Solutions/kilo 
Kilo
 2021-06-16 14:55:27 -04:00
William Wernert 5e11efb0b9 Merge pull request #4548 from Security-Onion-Solutions/fix/soup-merge-fix 
Fix merge issue in soup
 2021-06-16 14:36:24 -04:00
William Wernert 703988b376 Fix merge issue in soup 2021-06-16 14:28:20 -04:00
Jason Ertel fefd2677fb Only include so-common if available. It only is used for requiring root, but since this script is needed before common is installed, we can safely assume that it's being run as root already (during the install) 2021-06-16 14:26:26 -04:00
Jason Ertel a323aeb8fa Allow so-elastic-auth to run before common even though the script has dependency on a common-provided script (benign error). This is needed first since common will need to know if auth is enabled 2021-06-16 14:23:58 -04:00
Jason Ertel edac99e5a9 Merge pull request #4546 from Security-Onion-Solutions/kilo 
Accept either 200 or 401 instead of wasting 3 minutes waiting for thi…
 2021-06-16 11:41:23 -04:00
Jason Ertel dd14235e31 Accept either 200 or 401 instead of wasting 3 minutes waiting for this to timeout 2021-06-16 11:39:21 -04:00
Jason Ertel 15eadd4f89 Merge pull request #4545 from Security-Onion-Solutions/kilo 
Merge kilo to dev for additional ES Auth changes
 2021-06-16 11:04:39 -04:00
Jason Ertel 09fbb045a1 If ES auth disabled ensure user/pass are blank 2021-06-16 09:59:57 -04:00
Josh Patterson 7bdd0d3bf1 Merge pull request #4543 from Security-Onion-Solutions/issue/2977 
Issue/2977
 2021-06-16 08:16:36 -04:00
m0duspwnens ebea9a7198 remove space 2021-06-16 08:07:28 -04:00
m0duspwnens ad9441bb60 prevent suricata state from running on manager and managersearch https://github.com/Security-Onion-Solutions/securityonion/issues/2977 2021-06-16 08:06:26 -04:00
Jason Ertel 989f9dce42 Ensure sqlite.db exists before querying it; Execute so-elastic-auth after common state has been applied and redirect output to setup log 2021-06-15 16:57:13 -04:00
Jason Ertel b95437347e Upgrade ES to 7.13.2 2021-06-15 12:50:57 -04:00
Jason Ertel 2d27e0d9a9 Merge pull request #4530 from Security-Onion-Solutions/kilo 
Elastic auth
 2021-06-15 11:15:19 -04:00