From ad3b2c1df15a1c54cacd2936faf4eea7dd39beec Mon Sep 17 00:00:00 2001 From: Semyon Estrin Date: Mon, 7 Feb 2022 14:38:14 +0200 Subject: [PATCH] Update CHANGELOG NOTICES etc Co-Authored-By: Sasha Chernomordik --- .gitignore | 1 + CHANGELOG.md | 5 + NOTICES.txt | 143 ++++++++++++++--------------- app/models/role.rb | 2 +- config/environments/development.rb | 5 +- dev/start | 5 + gems/policy-parser/CHANGELOG.md | 1 + gems/policy-parser/test.sh | 2 +- 8 files changed, 88 insertions(+), 76 deletions(-) diff --git a/.gitignore b/.gitignore index 70bee2666f..03bfecf6d8 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,7 @@ engines/conjur_audit/spec/dummy/log data_key dhparam.pem *.deb +*.rpm .byebug_history config/database.yml reports diff --git a/CHANGELOG.md b/CHANGELOG.md index f329a574e7..5cf195a984 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Nothing should go in this section, please add to the latest unreleased version (and update the corresponding date), or add a new version. +## [0.0.1] - 2022-02-04 + +### Changed +- Upgrade to Ruby 3. [#2444](https://github.com/cyberark/conjur/pull/2444) + ## [1.16.0] - 2022-01-25 ### Added diff --git a/NOTICES.txt b/NOTICES.txt index c2c814119f..dac96964e0 100644 --- a/NOTICES.txt +++ b/NOTICES.txt @@ -8,56 +8,52 @@ of the license associated with each component. Section 1: Apache-2.0 ->>> https://rubygems.org/gems/aws-sdk-iam/versions/1.35.0 ->>> https://rubygems.org/gems/gli/versions/2.19.0 +>>> https://rubygems.org/gems/aws-sdk-iam/versions/1.66.0 +>>> https://rubygems.org/gems/gli/versions/2.20.1 Section 2: BSD-2-Clause >>> https://rubygems.org/gems/base32-crockford/versions/0.1.0 >>> https://rubygems.org/gems/pg/versions/1.2.3 +>>> https://rubygems.org/gems/websocket/versions/1.2.9 Section 3: BSD-3-Clause ->>> https://rubygems.org/gems/ffi/versions/1.12.2 ->>> https://rubygems.org/gems/puma/versions/5.5.1 +>>> https://rubygems.org/gems/ffi/versions/1.15.4 +>>> https://rubygems.org/gems/puma/versions/5.5.2 Section 4: MIT ->>> https://rubygems.org/gems/activesupport/versions/5.2.6 ->>> https://rubygems.org/gems/anyway_config/versions/2.1.0 +>>> https://rubygems.org/gems/activesupport/versions/6.1.4.4 +>>> https://rubygems.org/gems/anyway_config/versions/2.2.3 >>> https://rubygems.org/gems/base58/versions/0.2.3 ->>> https://rubygems.org/gems/bcrypt/versions/3.1.13 +>>> https://rubygems.org/gems/bcrypt/versions/3.1.16 >>> https://rubygems.org/gems/command_class/versions/0.0.2 >>> https://rubygems.org/gems/conjur-policy-parser/versions/3.0.4 ->>> https://rubygems.org/gems/conjur-rack/versions/4.2.0 +>>> https://rubygems.org/gems/conjur-rack/versions/5.0.0 >>> https://rubygems.org/gems/conjur-rack-heartbeat/versions/2.2.0 ->>> https://rubygems.org/gems/dry-struct/versions/0.4.0 ->>> https://rubygems.org/gems/dry-types/versions/0.12.3 +>>> https://rubygems.org/gems/dry-struct/versions/1.4.0 +>>> https://rubygems.org/gems/dry-types/versions/1.5.1 >>> https://rubygems.org/gems/http/versions/4.2.0 ->>> https://rubygems.org/gems/iso8601/versions/0.12.1 +>>> https://rubygems.org/gems/iso8601/versions/0.13.0 >>> https://rubygems.org/gems/jbuilder/versions/2.7.0 >>> https://rubygems.org/gems/jwt/versions/2.2.2 ->>> https://rubygems.org/gems/kubeclient/versions/4.6.0 ->>> https://rubygems.org/gems/listen/versions/3.2.1 ->>> https://rubygems.org/gems/loofah/versions/2.9.1 ->>> https://rubygems.org/gems/mini_racer/versions/0.2.9 ->>> https://rubygems.org/gems/net-ldap/versions/0.16.2 ->>> https://rubygems.org/gems/nokogiri/versions/1.12.5 +>>> https://rubygems.org/gems/kubeclient/versions/4.9.2 +>>> https://rubygems.org/gems/listen/versions/3.7.0 +>>> https://rubygems.org/gems/loofah/versions/2.13.0 +>>> https://rubygems.org/gems/net-ldap/versions/0.17.0 +>>> https://rubygems.org/gems/nokogiri/versions/1.13.1 >>> https://rubygems.org/gems/openid_connect/versions/1.3.0 >>> https://rubygems.org/gems/rack-rewrite/versions/1.5.1 ->>> https://rubygems.org/gems/rails/versions/5.2.6 ->>> https://rubygems.org/gems/rake/versions/13.0.3 ->>> https://rubygems.org/gems/ruby_dep/versions/1.3.1 ->>> https://rubygems.org/gems/sequel/versions/5.50.0 +>>> https://rubygems.org/gems/rails/versions/6.1.4.4 +>>> https://rubygems.org/gems/rake/versions/13.0.6 +>>> https://rubygems.org/gems/sequel/versions/5.51.0 >>> https://rubygems.org/gems/sequel-pg_advisory_locking/versions/1.0.1 >>> https://rubygems.org/gems/sequel-postgres-schemata/versions/0.1.3 ->>> https://rubygems.org/gems/sequel-rails/versions/1.1.0 +>>> https://rubygems.org/gems/sequel-rails/versions/1.1.1 >>> https://rubygems.org/gems/simplecov/versions/0.14.1 ->>> https://rubygems.org/gems/slosilo/versions/2.2.2 ->>> https://rubygems.org/gems/uglifier/versions/4.2.0 ->>> https://rubygems.org/gems/websocket-client-simple/versions/0.3.0 +>>> https://rubygems.org/gems/slosilo/versions/3.0.0 >>> https://rubygems.org/gems/event_emitter/versions/0.2.6 ->>> https://rubygems.org/gems/websocket/versions/1.2.8 APPENDIX: Standard License Files and Templates @@ -70,7 +66,7 @@ APPENDIX: Standard License Files and Templates Apache-2.0 License is applicable to the following component(s). ->>> https://rubygems.org/gems/aws-sdk-iam/versions/1.35.0 +>>> https://rubygems.org/gems/aws-sdk-iam/versions/1.66.0 Copyright 2011-2014 Amazon.com, Inc. or its affiliates. All Rights Reserved. @@ -86,7 +82,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ->>> https://rubygems.org/gem/gli/versions/2.19.0 +>>> https://rubygems.org/gem/gli/versions/2.20.1 Copyright @@ -131,6 +127,31 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +>>> https://rubygems.org/gems/websocket/versions/1.2.9 + +Copyright (c) 2013 The Gorilla WebSocket Authors. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + + Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + --------------- SECTION 3: BSD-3-Clause ---------- BSD-3-Clause License is applicable to the following component(s). @@ -164,7 +185,7 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ->>> https://rubygems.org/gems/ffi/versions/1.12.2 +>>> https://rubygems.org/gems/ffi/versions/1.15.4 Copyright (c) 2008-2016, Ruby FFI project contributors @@ -193,7 +214,7 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ->>> https://rubygems.org/gems/puma/versions/5.5.1 +>>> https://rubygems.org/gems/puma/versions/5.5.2 Some code copyright (c) 2005, Zed Shaw Copyright (c) 2011, Evan Phoenix @@ -226,7 +247,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. MIT License is applicable to the following component(s). ->>> https://rubygems.org/gems/activesupport/versions/5.2.6 +>>> https://rubygems.org/gems/activesupport/versions/6.1.4.4 Copyright (c) 2005-2018 David Heinemeier Hansson @@ -248,7 +269,7 @@ 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. ->>> https://rubygems.org/gems/anyway_config/versions/2.1.0 +>>> https://rubygems.org/gems/anyway_config/versions/2.2.3 Copyright (c) 2015-2020 Vladimir Dementyev @@ -295,7 +316,7 @@ 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. ->>> https://rubygems.org/gems/bcrypt/versions/3.1.13 +>>> https://rubygems.org/gems/bcrypt/versions/3.1.16 Copyright 2007-2011: @@ -366,7 +387,7 @@ 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. ->>> https://rubygems.org/gems/conjur-rack/versions/4.2.0 +>>> https://rubygems.org/gems/conjur-rack/versions/5.0.0 Copyright (c) 2020 CyberArk Software Ltd. All rights reserved. @@ -415,7 +436,7 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ->>> https://rubygems.org/gems/dry-struct/versions/0.4.0 +>>> https://rubygems.org/gems/dry-struct/versions/1.4.0 Copyright (c) 2013-2016 Piotr Solnica @@ -437,7 +458,7 @@ 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. ->>> https://rubygems.org/gems/dry-types/versions/0.12.3 +>>> https://rubygems.org/gems/dry-types/versions/1.5.1 Copyright (c) 2013-2014 Piotr Solnica @@ -481,7 +502,7 @@ 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. ->>> https://rubygems.org/gems/iso8601/versions/0.12.1 +>>> https://rubygems.org/gems/iso8601/versions/0.13.0 Copyright (c) 2012-2018 Arnau Siches @@ -546,7 +567,7 @@ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTIO OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ->>> https://rubygems.org/gems/kubeclient/versions/4.6.0 +>>> https://rubygems.org/gems/kubeclient/versions/4.9.2 Copyright (c) 2014 Alissa Bonas @@ -571,7 +592,7 @@ 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. ->>> https://rubygems.org/gems/listen/versions/3.2.1 +>>> https://rubygems.org/gems/listen/versions/3.7.0 Copyright (c) 2013 Thibaud Guillaume-Gentil @@ -593,7 +614,7 @@ 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. ->>> https://rubygems.org/gems/loofah/versions/2.9.1 +>>> https://rubygems.org/gems/loofah/versions/2.13.0 Copyright (c) 2009 -- 2018 by Mike Dalessio, Bryan Helmkamp @@ -637,7 +658,7 @@ 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. ->>> https://rubygems.org/gems/net-ldap/versions/0.16.2 +>>> https://rubygems.org/gems/net-ldap/versions/0.17.0 Copyright 2006–2011 by Francis Cianfrocca and other contributors. @@ -659,7 +680,7 @@ 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. ->>> https://rubygems.org/gems/nokogiri/versions/1.12.5 +>>> https://rubygems.org/gems/nokogiri/versions/1.13.1 Copyright 2008 -- 2018 by Aaron Patterson, Mike Dalessio, Charles Nutter, Sergio Arbeo, Patrick Mahoney, Yoko Harada, Akinori MUSHA, John Shahid, Lars Kanis @@ -727,7 +748,7 @@ 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. ->>> https://rubygems.org/gems/rails/versions/5.2.6 +>>> https://rubygems.org/gems/rails/versions/6.1.4.4 Copyright (c) 2005-2018 David Heinemeier Hansson @@ -749,7 +770,7 @@ 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. ->>> https://rubygems.org/gems/rake/versions/13.0.3 +>>> https://rubygems.org/gems/rake/versions/13.0.6 Copyright (c) Jim Weirich @@ -837,7 +858,7 @@ 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. ->>> https://rubygems.org/gems/sequel-rails/versions/1.1.0 +>>> https://rubygems.org/gems/sequel-rails/versions/1.1.1 Copyright (c) 2009-2013 The sequel-rails team @@ -903,7 +924,7 @@ 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. ->>> https://rubygems.org/gems/slosilo/versions/2.2.2 +>>> https://rubygems.org/gems/slosilo/versions/3.0.0 Copyright (c) 2020 CyberArk Software Ltd. All rights reserved. @@ -925,9 +946,11 @@ 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. ->>> https://rubygems.org/gems/uglifier/versions/4.2.0 +>>> https://rubygems.org/gems/event_emitter/versions/0.2.6 + +Copyright (c) 2012 Sho Hashimoto -Copyright (c) 2011 Ville Lautanala +MIT License Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -947,30 +970,6 @@ 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. ->>> https://rubygems.org/gems/websocket-client-simple/versions/0.3.0 - -Copyright (c) 2013-2014 Sho Hashimoto - -MIT License - -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. =============== APPENDIX: License Files and Templates ============== diff --git a/app/models/role.rb b/app/models/role.rb index 43d7bb0885..6785216f27 100644 --- a/app/models/role.rb +++ b/app/models/role.rb @@ -138,7 +138,7 @@ def direct_memberships_dataset(search_options = {}) .select(:role_memberships.*) end - def members_dataset(search_options = nil) + def members_dataset(search_options = {}) memberships_dataset.search(**search_options) .select(:role_memberships.*) end diff --git a/config/environments/development.rb b/config/environments/development.rb index 10a8533262..c7a29d77cd 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -10,8 +10,9 @@ # since you don't have to restart the web server when you make code changes. config.cache_classes = true - # Whitelist one hostname - puts "Adding conjur machine to whitelist" + # Whitelist conjur hostname for tests + # For more information, refer to: + # https://guides.rubyonrails.org/configuring.html#actiondispatch-hostauthorization config.hosts << "conjur" # eager_load needed to make authentication work without the hacky diff --git a/dev/start b/dev/start index 5cfd1212d6..53c76bf53a 100755 --- a/dev/start +++ b/dev/start @@ -41,6 +41,11 @@ main() { unset COMPOSE_PROJECT_NAME parse_options "$@" + if ! docker info >/dev/null 2>&1; then + echo "Docker does not seem to be running, run it first and retry" + exit 1 + fi + # Build docker images. docker-compose build --pull diff --git a/gems/policy-parser/CHANGELOG.md b/gems/policy-parser/CHANGELOG.md index 7aca7b9971..3886223c65 100644 --- a/gems/policy-parser/CHANGELOG.md +++ b/gems/policy-parser/CHANGELOG.md @@ -9,6 +9,7 @@ appear in the main Changelog.** * Return validation error when `restricted_to` values include address bits to the right of the provided netmask, or if the CIDR is not IPv4. [cyberark/conjur-policy-parser#30](https://github.com/cyberark/conjur-policy-parser/issues/30) +* Upgrade to Ruby V3. # v3.0.4 * Throw an error when a policy has duplicate members on a resource diff --git a/gems/policy-parser/test.sh b/gems/policy-parser/test.sh index 054c802605..c112d54034 100755 --- a/gems/policy-parser/test.sh +++ b/gems/policy-parser/test.sh @@ -1,6 +1,6 @@ #!/bin/bash -ex -# : ${RUBY_VERSION=3.0.2} +# : ${RUBY_VERSION=3.0} # # # My local RUBY_VERSION is set to ruby-#.#.# so this allows running locally. # RUBY_VERSION=$(cut -d '-' -f 2 <<< $RUBY_VERSION)