Commit Graph

4922 Commits

Author SHA1 Message Date
Jason Ertel
915b7aa2df Switch Kratos config from argon2 to bcrypt12 2021-05-24 10:52:54 -04:00
m0duspwnens
e2d5102a0e changes for script to auth to elastic 2021-05-24 10:13:29 -04:00
Mike Reeves
e5a41b60ef Merge remote-tracking branch 'remotes/origin/dev' into pipeline 2021-05-24 09:14:03 -04:00
Jason Ertel
0572ea4095 Fail curl command if a failing status code is returned by the remote server 2021-05-21 17:27:11 -04:00
Jason Ertel
71032150c5 Add secure HTTP headers to all SO application responses to reduce exposure to browser and other HTTP-related vulnerabilities 2021-05-21 17:27:00 -04:00
William Wernert
946e369a44 Merge branch 'dev' into foxtrot 2021-05-21 15:26:24 -04:00
William Wernert
c1dd4dafe4 Fix influx state 2021-05-21 12:41:10 -04:00
William Wernert
fe3aec173f Merge branch 'master' into feature/merge-2.3.51
# Conflicts:
#	VERSION
#	salt/influxdb/init.sls
2021-05-21 12:31:54 -04:00
Jason Ertel
b440f73336 Truncate wait_for_web_response.log before each wait invocation 2021-05-19 18:37:08 -04:00
William Wernert
f445186f1e Remove redundant error messages 2021-05-18 13:38:55 -04:00
William Wernert
bdd53ed5e3 Change retry delay + count 2021-05-18 12:23:40 -04:00
Josh Patterson
9b4325662b Merge pull request #4218 from Security-Onion-Solutions/issue/4207
Issue/4207
2021-05-18 09:04:26 -04:00
m0duspwnens
ef32bff302 fix up soc.json 2021-05-17 18:29:27 -04:00
m0duspwnens
e50002e0ca influx and grafana default for manager nodes - https://github.com/Security-Onion-Solutions/securityonion/issues/4207 2021-05-17 16:26:12 -04:00
William Wernert
dbd5ef70c9 Change retry delay + count 2021-05-17 16:19:31 -04:00
William Wernert
ce9554281e Fix backwards logic 2021-05-17 16:08:34 -04:00
William Wernert
4e1fba5b38 Only echo error code if not using retry 2021-05-17 16:04:13 -04:00
William Wernert
3f238f7a4a Set flag so trap doesn't repeat info 2021-05-17 16:02:52 -04:00
William Wernert
b89091cc7d Try retrying in curl instead of shell function 2021-05-17 15:58:25 -04:00
William Wernert
992b76a0f0 Remove debug lines 2021-05-17 15:38:10 -04:00
William Wernert
2bcd51b21c Fix error message 2021-05-17 15:10:57 -04:00
William Wernert
3625453668 Don't unmount airgap directory if not airgap 2021-05-17 11:00:28 -04:00
William Wernert
5821a122cc Merge branch 'dev' into issue/3220 2021-05-17 10:58:06 -04:00
m0duspwnens
54f9e3ff9d remove leading space on comment line 2021-05-14 16:24:16 -04:00
m0duspwnens
231e07dbbd circumvent file.patch putting ERROR in log if patch doesnt need applied 2021-05-14 15:19:45 -04:00
Mike Reeves
71a74a6656 Added updated script and core modules 2021-05-13 13:07:16 -04:00
m0duspwnens
d3af06e7a4 handle exception if influxdb module doesnt exist 2021-05-13 11:00:42 -04:00
m0duspwnens
74f2a61b25 install influxdb and grafana during setup prior to final highstate 2021-05-13 09:06:47 -04:00
Mike Reeves
68a667ee7c Add thirfpartydefaults.yml 2021-05-12 15:31:19 -04:00
William Wernert
192b5db25a Add true to end of functions ending with shorthand comparison
Functions ending with test using [[ <false> ]] && <cmd> will trip set -e, so adding true to the last line of the function will prevent the function from returning a nonzero code
2021-05-12 15:26:39 -04:00
William Wernert
9ced391c11 Fix indent in main(), re-add trap, remove ERR_HANDLED variable 2021-05-12 13:20:59 -04:00
William Wernert
807b525c79 Temp remove exit on failure + bash trap 2021-05-12 11:19:33 -04:00
William Wernert
7bd04deae7 Unset exit on failure for pkill command 2021-05-12 10:45:03 -04:00
William Wernert
c379822bf0 Set variable to skip trap if error already handled 2021-05-11 12:59:49 -04:00
m0duspwnens
ad67167e97 remove whitespace control 2021-05-11 12:58:21 -04:00
m0duspwnens
4012a8276c add template for module .yml file 2021-05-11 12:22:25 -04:00
m0duspwnens
efc028d0a5 handle the docker port bindings for filebeat modules 2021-05-10 18:08:47 -04:00
Mike Reeves
01a121e029 Add defaults.yml 2021-05-10 15:29:50 -04:00
William Wernert
f793450d97 Return actual exit code from retry 2021-05-10 13:22:13 -04:00
William Wernert
fec868432f Try to fix bash trap 2021-05-10 11:59:22 -04:00
William Wernert
d3b08beb53 Only cat file if it exists 2021-05-10 11:11:54 -04:00
William Wernert
a75d4841d0 Add debug lines 2021-05-10 11:05:24 -04:00
William Wernert
8b3730748b Add debug line and remove exit command on retry failure 2021-05-10 10:58:29 -04:00
William Wernert
de5552c91a Merge branch 'dev' into issue/3220 2021-05-10 10:33:52 -04:00
William Wernert
f8dd6890b2 Unset/set exit on command fail for retries 2021-05-07 16:50:59 -04:00
m0duspwnens
e3ce683970 Merge remote-tracking branch 'remotes/origin/dev' into issue/3264 2021-05-07 14:48:16 -04:00
m0duspwnens
9eb63b17f9 exit if retry fails 2021-05-07 14:48:02 -04:00
Doug Burks
293fb0a76d FEATURE: Pivot from Alerts/Hunt to CyberChef #4081 2021-05-07 13:23:46 -04:00
Doug Burks
2e228c8355 FEATURE: Pivot from Alerts/Hunt to CyberChef #4081 2021-05-07 13:22:03 -04:00
m0duspwnens
009f7617c1 check salt-master is responding 2021-05-07 12:47:22 -04:00