diff --git a/VERSION b/VERSION index 4d5e528..acf69b4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5.0.6 \ No newline at end of file +5.1.0 \ No newline at end of file diff --git a/sandfly.agent.sha512.txt b/sandfly.agent.sha512.txt index 57aab61..f01c500 100644 --- a/sandfly.agent.sha512.txt +++ b/sandfly.agent.sha512.txt @@ -1,13 +1,13 @@ -5273ecf65c90cc2aa64fe1e933bd1e3e48aa30589dcaf125eaaf0d7106cf72276a8e737e43f02ae488ac02e40664bd8d694e699aa1b8b01c03fcdecb995b14e3 *sandfly.386 -71326979696ed7856cf3434d2b26c372da727f260a0cb2d73d9eb7e519aaee02e29c5eee5e2400cac3c1058c7c1ced36083a0cef25dbcab948121211bc7efc99 *sandfly.amd64 -6785490156fc6094a00f6af967b0c0621855e6df0b19d9ca561060b36b1f5fbf2b97ed328022f96313985845f0925245e15e0a366ea498090ff7787703439d3e *sandfly.arm -17e3d8f6069740bc29d2c79178a80e3067a9ba6442467ae652c12ec5c12dd9bf8c270cc7fe327d872626aedd2fe8488a16a41e17b18db1a818566f2921ea87cf *sandfly.arm5 -1aec7ad0271734e634867f417bcee433b3b3f0e99466864a899e943435907415f5deea954059b3028c2317cbc40ceddd66197ca8cf406799f8440b40ddd8ef4e *sandfly.arm6 -bcdd662f1db061889bd8408e40c38fa5929c03bc65660d76d2c2b01ac034d91247d74cb390c17cef745b1d21beba8d08478593c4b2d893d38a934c4937f920a0 *sandfly.arm64 -d2c8a2318335189b60d31c7d0437f3a3d7ceb5e44272188f73d80528ad408ddccf3a50f5163bda33e7162f993335929765a062a26265deaf31bd4f1631afa58e *sandfly.arm7 -bca2e8ddf89a5b96130c485dee6b6028be61fbea33f4b5b3a3b27e048707c978049b09eba696f477252d596fb4546c1092abbe6eef0087d06178f080b3f63497 *sandfly.mips -7ef76fee493ae31ee2a954c2d294b0918d1c26c2b042072d35d108590a811847b7f20faef1cbf1b7f5a7ff1029463f314d2a6d7fd688ad03513605a638715988 *sandfly.mips64 -0dff875d6f23d7a65431b1ab090a8d7c1896050b372c9250225c748a5f66c5934683de9c131157512742593f5c6c54597344da9a266bc96b7ffa26e6c1a9cb86 *sandfly.mips64le -a654a98ea91cc17f8227c40a33b652a8255e20a29c4d065be5ca3b6a11481b7db6ae401a965e4bd4384dec6753d118164603850ec2746af358430e13d238d55e *sandfly.mipsle -9df4677a3b5d77aa00db3325297d75f633a8dae6ed7224f672d64e7f5df5c9e1ce4a74853623c3a303545a95439835cd9b5c12893a9c5ea4864ea5e74ef1c732 *sandfly.ppc64le -cf199f4c08ab195dd0bd70b4030141dd1a220f0c181a31a2a5ec72042eb6db808f5aa809a922cfa1ca800df44b12a541fdd2bc38df237a68db9459d640fc71cf *sandfly.s390x +2d8585c5546d7f68aa203519ba64a7f5b0be185fecef14d4051b1ad3c29e6da93ab974ebde58707afb5f074894c426981be7a6e28dc8412464dff4b9834a4f09 *sandfly.386 +459eac7b28ee4ef82909819f2f495851c26e423466e57fdd7e6234250ed3421a8d80ea4c165f36a5b7c678a19b7e2b154e7cc9b15913ba9e41d6e738e4e63074 *sandfly.amd64 +5e928b4bfc35edce29e7b16210fe8f6b82ce320cad068c0685c0ddc30076ddd021a2f6d1850db021f5284d17b6d7f679a2dbc48b196c3192316ea7fc75283391 *sandfly.arm +1d76baa02272221d44be36608e8d42d284872a8a9769d38ef8a9a2276cab7b875047a1c7209ae2581563e90823d9b3e3cc629dffe292acac635ffa82b684fd55 *sandfly.arm5 +9be1658a2049bc04836f8890a3ac7d370a9b932392997b7d677f7d302ece41ca9d358e447634ce841240a1e7aea71097c4115e2fcaa59150d7fa0bfee9a47fbe *sandfly.arm6 +fb11dca0868ac7166812c02140acaafd587e27fed190f20c8ab91592c9ac49f8d709fe912efd9146bdfd325c28d3c108f19ec800949fbde5dac78380e2c66abd *sandfly.arm64 +db339052164de85d66d7e9066d28eb7cb86de803fc2b0a55e7b8eee57ca6f8c226fe5059e85bba77208c5bdf9715f59f6d362c889ad3b1c79122a576c0b6d3fd *sandfly.arm7 +5fb9ab2d86fc6a19299b07715aaf694ee9acca82a54f760b5eeb14569b885d0b7176ce73cb4801f07b8b90adab38bc4d327ff9f8113086189c28d15869e720ab *sandfly.mips +79d396fe095859ab43b0388c12a01fbdb98cfe28aee1d1ce8c6fd5a33c8de25684ca753598b748d9515f4369b8a006dc0d28187842eb8fe6ca96693065895f17 *sandfly.mips64 +b8f35e11f73da43abe0f08d1be6d75c6c9e54df875092bbc4e7f29b9244f2273b7ec25f2127fd2d454aa5a1b67af58251204e6c5f6e3b5e6282e1b36c5eeab6e *sandfly.mips64le +153165b0e3187c9ab73d5822cb85458d785f128caaf83bf017002e8fb8820d831e54644bbfc00c0d0564f509eaed76d38033eeb7b5f3cb0d6ae639210384327e *sandfly.mipsle +61726921f988e987027ee3ebfc08f78deb91b0c8d9c9802772b737b59fb4f633a72c1b6b45ea50a9148c529aa2809ef7575fde711e5331a67cc32834386ff53e *sandfly.ppc64le +2273fa2f41ee0212c610125751ce9e313ffbd73942c3e54533e11d23387b54ac0d43782996b3b72f2e54db0894cfe1c82c9eadbf4cd4b1402662d72f721be1ee *sandfly.s390x diff --git a/setup/setup_data/templates/config.server.template.json b/setup/setup_data/templates/config.server.template.json index cdf190e..0e56f8c 100644 --- a/setup/setup_data/templates/config.server.template.json +++ b/setup/setup_data/templates/config.server.template.json @@ -36,7 +36,10 @@ }, "options": { "log_level": "info", - "disable_strict_tls_policy": false + "disable_strict_tls_policy": false, + "ui_session_timeout_minutes": 60, + "ui_session_expiration_minutes": 1440, + "ssh_hunter_view_refresh_timer_delay_seconds": 60 } } } diff --git a/setup/util_scripts/offline_packager.sh b/setup/util_scripts/offline_packager.sh index bbf9a03..2fd3847 100755 --- a/setup/util_scripts/offline_packager.sh +++ b/setup/util_scripts/offline_packager.sh @@ -11,7 +11,7 @@ cd "$( dirname "${BASH_SOURCE[0]}" )" SF_VERSION=${SANDFLY_VERSION:-$(cat ../../VERSION)} -PG_VERSION=${POSTGRES_VERSION:-$(grep -oP '^(docker.io/library/)?postgres:\K([0-9.]+)' ../../start_scripts/start_postgres.sh)} +PG_VERSION=${POSTGRES_VERSION:-$(grep -oP 'POSTGRES_VERSION:-\K([0-9.]+)' ../../start_scripts/start_postgres.sh)} WHOAMI=$(whoami) if ! command -v docker >/dev/null 2>&1; then diff --git a/start_scripts/start_postgres.sh b/start_scripts/start_postgres.sh index 72a4b4c..f7e46ff 100755 --- a/start_scripts/start_postgres.sh +++ b/start_scripts/start_postgres.sh @@ -5,6 +5,9 @@ # Make sure we run from the correct directory so relative paths work cd "$( dirname "${BASH_SOURCE[0]}" )" +IMAGE_BASE=${POSTGRES_IMAGE_BASE:-docker.io/library} +VERSION=${POSTGRES_VERSION:-14.12} + LOG_MAX_SIZE="20m" if [ -f "/snap/bin/docker" ]; then @@ -214,7 +217,7 @@ docker run \ --log-opt max-size=${LOG_MAX_SIZE} \ --log-opt max-file=5 \ -t \ -docker.io/library/postgres:14.11 \ +${IMAGE_BASE}/postgres:${VERSION} \ -c max_connections=$(($max_connections+10)) \ -c shared_buffers=${shared_buffers}kB \ -c effective_cache_size=${effective_cache_size}kB \ diff --git a/third_party_licenses.txt b/third_party_licenses.txt index dcafdcd..04c3b4d 100644 --- a/third_party_licenses.txt +++ b/third_party_licenses.txt @@ -31,7 +31,7 @@ SOFTWARE. =============================================================================== MIT License -Copyright (c) 2019 Anton Medvedev +Copyright (c) 2018 Anton Medvedev Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -112,7 +112,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. =============================================================================== -Copyright 2015-2023 Brett Vickers. All rights reserved. +Copyright 2015-2024 Brett Vickers. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions @@ -1038,6 +1038,33 @@ The above copyright notice and this permission notice shall be included in all c THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +=============================================================================== +MIT License + +Copyright (c) 2014-2017 Buildkite Pty Ltd +Copyright (c) 2023 Michael Fridman + + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + =============================================================================== MIT License