From dcc70596163ad4d06ddfaafc9a107ad905be88af Mon Sep 17 00:00:00 2001 From: Jez Caudle Date: Thu, 19 Jun 2025 11:25:15 +0000 Subject: [PATCH] Updated the Gemfile Updated the README with installation instructions --- Gemfile | 5 +- Gemfile.lock | 186 ++++++++++++++++++++++++++++----------------------- README.md | 14 ++++ 3 files changed, 118 insertions(+), 87 deletions(-) diff --git a/Gemfile b/Gemfile index 32b0bfa..d39754e 100644 --- a/Gemfile +++ b/Gemfile @@ -21,7 +21,7 @@ gem "turbo-rails" gem "stimulus-rails" # Build JSON APIs with ease [https://github.com/rails/jbuilder] -gem "jbuilder" +gem "jbuilder", ">= 2.13.0" # Use Active Model has_secure_password [https://guides.rubyonrails.org/active_model_basics.html#securepassword] # gem "bcrypt", "~> 3.1.7" @@ -41,9 +41,6 @@ gem "bootsnap", require: false gem 'devise' gem 'cancancan' -# Reduces boot times through caching; required in config/boot.rb -gem "bootsnap", require: false - # Deploy this application anywhere as a Docker container [https://kamal-deploy.org] gem "kamal", require: false diff --git a/Gemfile.lock b/Gemfile.lock index 2cbe40f..959c758 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -72,21 +72,21 @@ GEM securerandom (>= 0.3) tzinfo (~> 2.0, >= 2.0.5) uri (>= 0.13.1) - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) ast (2.4.3) - base64 (0.2.0) + base64 (0.3.0) bcrypt (3.1.20) bcrypt_pbkdf (1.1.1) benchmark (0.4.1) - bigdecimal (3.1.7) + bigdecimal (3.2.2) bindex (0.8.1) - bootsnap (1.18.3) + bootsnap (1.18.6) msgpack (~> 1.2) brakeman (7.0.2) racc - builder (3.2.4) - cancancan (3.5.0) + builder (3.3.0) + cancancan (3.6.1) capybara (3.40.0) addressable matrix @@ -97,10 +97,10 @@ GEM regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) concurrent-ruby (1.3.5) - connection_pool (2.4.1) + connection_pool (2.5.3) crass (1.0.6) date (3.4.1) - debug (1.9.2) + debug (1.11.0) irb (~> 1.10) reline (>= 0.3.8) devise (4.9.4) @@ -110,51 +110,58 @@ GEM responders warden (~> 1.2.3) dotenv (3.1.8) - drb (2.2.1) + drb (2.2.3) ed25519 (1.4.0) - erubi (1.12.0) + erb (5.0.1) + erubi (1.13.1) et-orbi (1.2.11) tzinfo - ffi (1.16.3) - fiddle (1.1.2) + ffi (1.17.2) + ffi (1.17.2-aarch64-linux-gnu) + ffi (1.17.2-arm-linux-gnu) + ffi (1.17.2-arm64-darwin) + ffi (1.17.2-x86-linux-gnu) + ffi (1.17.2-x86_64-darwin) + ffi (1.17.2-x86_64-linux-gnu) + fiddle (1.1.8) fugit (1.11.1) et-orbi (~> 1, >= 1.2.11) raabro (~> 1.4) globalid (1.2.1) activesupport (>= 6.1) - i18n (1.14.4) + i18n (1.14.7) concurrent-ruby (~> 1.0) - image_processing (1.12.2) - mini_magick (>= 4.9.5, < 5) + image_processing (1.14.0) + mini_magick (>= 4.9.5, < 6) ruby-vips (>= 2.0.17, < 3) - importmap-rails (2.0.1) + importmap-rails (2.1.0) actionpack (>= 6.0.0) activesupport (>= 6.0.0) railties (>= 6.0.0) - io-console (0.7.2) + io-console (0.8.0) irb (1.15.2) pp (>= 0.6.0) rdoc (>= 4.0.0) reline (>= 0.4.2) - jbuilder (2.11.5) + jbuilder (2.13.0) actionview (>= 5.0.0) activesupport (>= 5.0.0) json (2.12.2) - kamal (2.2.2) + kamal (2.7.0) activesupport (>= 7.0) base64 (~> 0.2) bcrypt_pbkdf (~> 1.0) concurrent-ruby (~> 1.2) dotenv (~> 3.1) - ed25519 (~> 1.2) - net-ssh (~> 7.0) + ed25519 (~> 1.4) + net-ssh (~> 7.3) sshkit (>= 1.23.0, < 2.0) thor (~> 1.3) - zeitwerk (~> 2.5) + zeitwerk (>= 2.6.18, < 3.0) language_server-protocol (3.17.0.5) lint_roller (1.1.0) - logger (1.6.1) - loofah (2.22.0) + logger (1.7.0) + loofah (2.24.1) crass (~> 1.0.2) nokogiri (>= 1.12.0) mail (2.8.1) @@ -163,12 +170,14 @@ GEM net-pop net-smtp marcel (1.0.4) - matrix (0.4.2) - mini_magick (4.12.0) + matrix (0.4.3) + mini_magick (5.2.0) + benchmark + logger mini_mime (1.1.5) - mini_portile2 (2.8.6) - minitest (5.22.3) - msgpack (1.7.2) + mini_portile2 (2.8.9) + minitest (5.25.5) + msgpack (1.8.0) mysql2 (0.5.6) net-imap (0.5.8) date @@ -184,12 +193,22 @@ GEM net-smtp (0.5.1) net-protocol net-ssh (7.3.0) - nio4r (2.7.1) - nokogiri (1.16.4) + nio4r (2.7.4) + nokogiri (1.18.8) mini_portile2 (~> 2.8.2) racc (~> 1.4) + nokogiri (1.18.8-aarch64-linux-gnu) + racc (~> 1.4) + nokogiri (1.18.8-arm-linux-gnu) + racc (~> 1.4) + nokogiri (1.18.8-arm64-darwin) + racc (~> 1.4) + nokogiri (1.18.8-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.18.8-x86_64-linux-gnu) + racc (~> 1.4) orm_adapter (0.5.0) - ostruct (0.6.0) + ostruct (0.6.2) parallel (1.27.0) parser (3.3.8.0) ast (~> 2.4.1) @@ -203,21 +222,22 @@ GEM activesupport (>= 7.0.0) rack railties (>= 7.0.0) - psych (5.1.2) + psych (5.2.6) + date stringio - public_suffix (5.0.5) - puma (6.4.2) + public_suffix (6.0.2) + puma (6.6.0) nio4r (~> 2.0) raabro (1.4.0) - racc (1.7.3) - rack (2.2.9) - rack-session (1.0.2) - rack (< 3) - rack-test (2.1.0) + racc (1.8.1) + rack (3.1.16) + rack-session (2.1.1) + base64 (>= 0.1.0) + rack (>= 3.0.0) + rack-test (2.2.0) rack (>= 1.3) - rackup (1.0.0) - rack (< 3) - webrick + rackup (2.2.1) + rack (>= 3) rails (8.0.2) actioncable (= 8.0.2) actionmailbox (= 8.0.2) @@ -232,13 +252,13 @@ GEM activesupport (= 8.0.2) bundler (>= 1.15.0) railties (= 8.0.2) - rails-dom-testing (2.2.0) + rails-dom-testing (2.3.0) activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.6.0) + rails-html-sanitizer (1.6.2) loofah (~> 2.21) - nokogiri (~> 1.14) + nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) railties (8.0.2) actionpack (= 8.0.2) activesupport (= 8.0.2) @@ -248,52 +268,54 @@ GEM thor (~> 1.0, >= 1.2.2) zeitwerk (~> 2.6) rainbow (3.1.1) - rake (13.2.1) - rdoc (6.6.3.1) + rake (13.3.0) + rdoc (6.14.1) + erb psych (>= 4.0.0) - regexp_parser (2.9.0) - reline (0.5.3) + regexp_parser (2.10.0) + reline (0.6.1) io-console (~> 0.5) responders (3.1.1) actionpack (>= 5.2) railties (>= 5.2) - rexml (3.2.6) - rubocop (1.69.0) + rexml (3.4.1) + rubocop (1.76.2) json (~> 2.3) - language_server-protocol (>= 3.17.0) + language_server-protocol (~> 3.17.0.2) + lint_roller (~> 1.1.0) parallel (~> 1.10) parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 2.4, < 3.0) - rubocop-ast (>= 1.36.1, < 2.0) + regexp_parser (>= 2.9.3, < 3.0) + rubocop-ast (>= 1.45.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 4.0) rubocop-ast (1.45.1) parser (>= 3.3.7.2) prism (~> 1.4) - rubocop-minitest (0.37.0) + rubocop-performance (1.25.0) lint_roller (~> 1.1) - rubocop (>= 1.61, < 2.0) + rubocop (>= 1.75.0, < 2.0) rubocop-ast (>= 1.38.0, < 2.0) - rubocop-performance (1.23.1) - rubocop (>= 1.48.1, < 2.0) - rubocop-ast (>= 1.31.1, < 2.0) - rubocop-rails (2.29.1) + rubocop-rails (2.32.0) activesupport (>= 4.2.0) + lint_roller (~> 1.1) rack (>= 1.1) - rubocop (>= 1.52.0, < 2.0) - rubocop-ast (>= 1.31.1, < 2.0) - rubocop-rails-omakase (1.0.0) - rubocop - rubocop-minitest - rubocop-performance - rubocop-rails + rubocop (>= 1.75.0, < 2.0) + rubocop-ast (>= 1.44.0, < 2.0) + rubocop-rails-omakase (1.1.0) + rubocop (>= 1.72) + rubocop-performance (>= 1.24) + rubocop-rails (>= 2.30) ruby-progressbar (1.13.0) - ruby-vips (2.2.1) + ruby-vips (2.2.4) ffi (~> 1.12) - rubyzip (2.3.2) + logger + rubyzip (2.4.1) securerandom (0.4.1) - selenium-webdriver (4.10.0) + selenium-webdriver (4.33.0) + base64 (~> 0.2) + logger (~> 1.4) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) @@ -320,20 +342,19 @@ GEM net-sftp (>= 2.1.2) net-ssh (>= 2.8.0) ostruct - stimulus-rails (1.3.3) + stimulus-rails (1.3.4) railties (>= 6.0.0) - stringio (3.1.0) - thor (1.3.1) + stringio (3.1.7) + thor (1.3.2) thruster (0.1.14) thruster (0.1.14-aarch64-linux) thruster (0.1.14-arm64-darwin) thruster (0.1.14-x86_64-darwin) thruster (0.1.14-x86_64-linux) timeout (0.4.3) - turbo-rails (2.0.5) - actionpack (>= 6.0.0) - activejob (>= 6.0.0) - railties (>= 6.0.0) + turbo-rails (2.0.16) + actionpack (>= 7.1.0) + railties (>= 7.1.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (3.1.4) @@ -348,15 +369,14 @@ GEM activemodel (>= 6.0.0) bindex (>= 0.4.0) railties (>= 6.0.0) - webrick (1.8.1) - websocket (1.2.10) + websocket (1.2.11) websocket-driver (0.8.0) base64 websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.6.13) + zeitwerk (2.7.3) PLATFORMS aarch64-linux @@ -378,7 +398,7 @@ DEPENDENCIES fiddle image_processing (~> 1.2) importmap-rails - jbuilder + jbuilder (>= 2.13.0) kamal logger mysql2 (~> 0.5) diff --git a/README.md b/README.md index d6dd5a3..e76960b 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,21 @@ pkg_add mariadb-server /usr/local/bin/mariadb-install-db rcctl start mysqld mariadb-secure-installation + +git clone https:// +cd where +bundle install +bundle update + +mariadb -u root + +SET old_passwords=0; +CREATE USER 'caf'@'%' IDENTIFIED BY 'caf_password'; +CREATE DATABASE cafdb CHARACTER SET 'utf8mb4' COLLATE 'utf8mb4_bin'; +GRANT ALL PRIVILEGES ON cafdb.* TO 'caf'; +FLUSH PRIVILEGES; ``` + Welcome to the Hidden Agenda Ltd CAF tool to help you get organised to become National Cyber Security Centre "Cyber Assessment Framework" (CAF) compliant. This is a Ruby On Rails app and released under a MIT License.