From c2ec1295cf7a941cb59d17b45b9a98eedcac1323 Mon Sep 17 00:00:00 2001 From: BradHacker Date: Fri, 23 Feb 2024 15:48:50 -0500 Subject: [PATCH 1/4] Add README --- README.md | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..9044f6c --- /dev/null +++ b/README.md @@ -0,0 +1,43 @@ +# ritsec.github.io + +Website for RITESC. Built using [Jekyll](https://jekyllrb.com/) + +## Development + +### Install Ruby + +#### Method 1 - `rbenv` (Recommended) + +1. Install `rbenv` with your package manager (see [here](https://github.com/rbenv/rbenv?tab=readme-ov-file#using-package-managers)) +2. Install the proper `ruby` version with `rbenv install` + +#### Method 2 - Manual Installation + +> ⚠️ **Be sure to check the [`.ruby-version`](./.ruby-version) file to ensure you're installing the correct Ruby version** + +You can install Ruby manually using the instructions found [here](https://www.ruby-lang.org/en/documentation/installation/). + +### Install dependencies + +Install [`bundler`](https://bundler.io/) to easily install all of the dependency gems: + +```shell +gem install bundler +bundle +``` + +### Development Server + +To start up the dev server (runs locally on `http://127.0.0.1:4000`) run: + +```shell +bundle exec jekyll serve +``` + +### Development Build + +To generate a static build of the site run: + +```shell +bundle exec jekyll build +``` From 36248f83a7813806a5a901b2782f1ae8bb01e40b Mon Sep 17 00:00:00 2001 From: BradHacker Date: Fri, 23 Feb 2024 15:49:12 -0500 Subject: [PATCH 2/4] Fix education links breaking build --- _data/education.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/_data/education.yml b/_data/education.yml index 82a0f39..888a81e 100644 --- a/_data/education.yml +++ b/_data/education.yml @@ -1,7 +1,7 @@ sections: - title: Fall 2023 description: Education Slides - more about some of our favorite topics with our project-focused education system - + sets: - title: Week 0 | Intro to RITSEC description: Introduction to RITSEC @@ -86,7 +86,7 @@ sections: url: https://flags.ritsec.club - title: Spring 2024 description: Education Slides - more about some of our favorite topics with our project-focused education system - + sets: - title: Week 1 | The Cloud description: The Cloud @@ -102,7 +102,7 @@ sections: lessons: - title: Education Slides description: Pentesting - url: Week 3 - https://docs.google.com/presentation/d/1mwC3Ty2VI6phjvUCYnRPWL7fPpndlFuTxJfJB3ut-n4/edit?usp=sharing + url: https://docs.google.com/presentation/d/1mwC3Ty2VI6phjvUCYnRPWL7fPpndlFuTxJfJB3ut-n4/edit?usp=sharing - title: Demo Challenges description: Download the VMs from the ctfd url: https://flags.ritsec.club @@ -111,7 +111,7 @@ sections: lessons: - title: Education Slides description: Advanced Linux - url: Week 4 - https://docs.google.com/presentation/d/1Bbjop1qRsCiMp7FIpJhZ3u0hqGzw4gg01QcRvjEGzdU/edit?usp=sharing + url: https://docs.google.com/presentation/d/1Bbjop1qRsCiMp7FIpJhZ3u0hqGzw4gg01QcRvjEGzdU/edit?usp=sharing - title: Demo Challenges description: Download the VMs from the ctfd url: https://flags.ritsec.club @@ -120,7 +120,7 @@ sections: lessons: - title: Education Slides description: Advanced Windows - url: Week 5 - https://docs.google.com/presentation/d/1S-u_4QMEcgbwRz_e71lW3S_m-lT7qmO_H2Svntkysec/edit?usp=sharing + url: https://docs.google.com/presentation/d/1S-u_4QMEcgbwRz_e71lW3S_m-lT7qmO_H2Svntkysec/edit?usp=sharing - title: Demo Challenges description: Download the VMs from the ctfd - url: https://flags.ritsec.club \ No newline at end of file + url: https://flags.ritsec.club From 1d47a777c4faa54ac67e41de4b42c164f52cf8bc Mon Sep 17 00:00:00 2001 From: BradHacker Date: Fri, 23 Feb 2024 15:53:31 -0500 Subject: [PATCH 3/4] Add Jekyll build GH action --- .github/workflows/build-site.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/workflows/build-site.yml diff --git a/.github/workflows/build-site.yml b/.github/workflows/build-site.yml new file mode 100644 index 0000000..499fe25 --- /dev/null +++ b/.github/workflows/build-site.yml @@ -0,0 +1,17 @@ +name: Build Jekyll site +on: + pull_request: + branches: + - master +permissions: + contents: read +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Setup Pages + uses: actions/configure-pages@v3 + - name: Build + uses: actions/jekyll-build-pages@v1 From 8a9ada096db06e70039d9f4eb3bf6a8a36815b3f Mon Sep 17 00:00:00 2001 From: BradHacker Date: Fri, 23 Feb 2024 16:03:58 -0500 Subject: [PATCH 4/4] Bump dependencies for security patches --- Gemfile | 6 +-- Gemfile.lock | 104 +++++++++++++++++++++++++++++---------------------- 2 files changed, 62 insertions(+), 48 deletions(-) diff --git a/Gemfile b/Gemfile index d162607..6f7994c 100644 --- a/Gemfile +++ b/Gemfile @@ -3,9 +3,9 @@ source "https://rubygems.org" #gem "jekyll", ENV["JEKYLL_VERSION"] if ENV["JEKYLL_VERSION"] -gem "github-pages", "~> 228", group: :jekyll_plugins +gem "github-pages", "~> 231", group: :jekyll_plugins gem "kramdown-parser-gfm" if ENV["JEKYLL_VERSION"] == "~> 3.9" -gem "jekyll-seo-tag", "~> 2.7" +gem "jekyll-seo-tag", "~> 2.8" -gem "webrick", "~> 1.7" +gem "webrick", "~> 1.8.1" diff --git a/Gemfile.lock b/Gemfile.lock index 1ba72ae..48d05f8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,22 +1,32 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.0.7.2) + activesupport (7.1.3.2) + base64 + bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb i18n (>= 1.6, < 2) minitest (>= 5.1) + mutex_m tzinfo (~> 2.0) addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) + base64 (0.2.0) + bigdecimal (3.1.6) coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.11.1) + coffee-script-source (1.12.2) colorator (1.1.0) commonmarker (0.23.10) concurrent-ruby (1.2.2) + connection_pool (2.4.1) dnsruby (1.70.0) simpleidn (~> 0.2.1) + drb (2.2.0) + ruby2_keywords em-websocket (0.5.3) eventmachine (>= 0.12.9) http_parser.rb (~> 0) @@ -24,24 +34,24 @@ GEM ffi (>= 1.15.0) eventmachine (1.2.7) eventmachine (1.2.7-x64-mingw32) - execjs (2.8.1) - faraday (2.7.10) - faraday-net_http (>= 2.0, < 3.1) - ruby2_keywords (>= 0.0.4) - faraday-net_http (3.0.2) + execjs (2.9.1) + faraday (2.9.0) + faraday-net_http (>= 2.0, < 3.2) + faraday-net_http (3.1.0) + net-http ffi (1.15.5) forwardable-extended (2.6.0) - gemoji (3.0.1) - github-pages (228) - github-pages-health-check (= 1.17.9) - jekyll (= 3.9.3) - jekyll-avatar (= 0.7.0) - jekyll-coffeescript (= 1.1.1) + gemoji (4.1.0) + github-pages (231) + github-pages-health-check (= 1.18.2) + jekyll (= 3.9.5) + jekyll-avatar (= 0.8.0) + jekyll-coffeescript (= 1.2.2) jekyll-commonmark-ghpages (= 0.4.0) - jekyll-default-layout (= 0.1.4) - jekyll-feed (= 0.15.1) + jekyll-default-layout (= 0.1.5) + jekyll-feed (= 0.17.0) jekyll-gist (= 1.5.0) - jekyll-github-metadata (= 2.13.0) + jekyll-github-metadata (= 2.16.1) jekyll-include-cache (= 0.2.1) jekyll-mentions (= 1.6.0) jekyll-optional-front-matter (= 0.3.2) @@ -68,20 +78,20 @@ GEM jekyll-theme-tactile (= 0.2.0) jekyll-theme-time-machine (= 0.2.0) jekyll-titles-from-headings (= 0.5.3) - jemoji (= 0.12.0) - kramdown (= 2.3.2) + jemoji (= 0.13.0) + kramdown (= 2.4.0) kramdown-parser-gfm (= 1.1.0) liquid (= 4.0.4) mercenary (~> 0.3) minima (= 2.5.1) nokogiri (>= 1.13.6, < 2.0) - rouge (= 3.26.0) + rouge (= 3.30.0) terminal-table (~> 1.4) - github-pages-health-check (1.17.9) + github-pages-health-check (1.18.2) addressable (~> 2.3) dnsruby (~> 1.60) - octokit (~> 4.0) - public_suffix (>= 3.0, < 5.0) + octokit (>= 4, < 8) + public_suffix (>= 3.0, < 6.0) typhoeus (~> 1.3) html-pipeline (2.14.3) activesupport (>= 2) @@ -89,7 +99,7 @@ GEM http_parser.rb (0.8.0) i18n (1.14.1) concurrent-ruby (~> 1.0) - jekyll (3.9.3) + jekyll (3.9.5) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -102,11 +112,11 @@ GEM pathutil (~> 0.9) rouge (>= 1.7, < 4) safe_yaml (~> 1.0) - jekyll-avatar (0.7.0) + jekyll-avatar (0.8.0) jekyll (>= 3.0, < 5.0) - jekyll-coffeescript (1.1.1) + jekyll-coffeescript (1.2.2) coffee-script (~> 2.2) - coffee-script-source (~> 1.11.1) + coffee-script-source (~> 1.12) jekyll-commonmark (1.4.0) commonmarker (~> 0.22) jekyll-commonmark-ghpages (0.4.0) @@ -114,15 +124,15 @@ GEM jekyll (~> 3.9.0) jekyll-commonmark (~> 1.4.0) rouge (>= 2.0, < 5.0) - jekyll-default-layout (0.1.4) - jekyll (~> 3.0) - jekyll-feed (0.15.1) + jekyll-default-layout (0.1.5) + jekyll (>= 3.0, < 5.0) + jekyll-feed (0.17.0) jekyll (>= 3.7, < 5.0) jekyll-gist (1.5.0) octokit (~> 4.2) - jekyll-github-metadata (2.13.0) + jekyll-github-metadata (2.16.1) jekyll (>= 3.4, < 5.0) - octokit (~> 4.0, != 4.4.0) + octokit (>= 4, < 7, != 4.4.0) jekyll-include-cache (0.2.1) jekyll (>= 3.7, < 5.0) jekyll-mentions (1.6.0) @@ -193,11 +203,11 @@ GEM jekyll (>= 3.3, < 5.0) jekyll-watch (2.2.1) listen (~> 3.0) - jemoji (0.12.0) - gemoji (~> 3.0) + jemoji (0.13.0) + gemoji (>= 3, < 5) html-pipeline (~> 2.2) jekyll (>= 3.0, < 5.0) - kramdown (2.3.2) + kramdown (2.4.0) rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) @@ -206,13 +216,16 @@ GEM rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.3.6) - mini_portile2 (2.8.4) + mini_portile2 (2.8.5) minima (2.5.1) jekyll (>= 3.5, < 5.0) jekyll-feed (~> 0.9) jekyll-seo-tag (~> 2.1) - minitest (5.20.0) - nokogiri (1.15.4) + minitest (5.22.2) + mutex_m (0.2.0) + net-http (0.4.1) + uri + nokogiri (1.16.2) mini_portile2 (~> 2.8.2) racc (~> 1.4) octokit (4.25.1) @@ -221,12 +234,12 @@ GEM pathutil (0.16.2) forwardable-extended (~> 2.6) public_suffix (4.0.7) - racc (1.7.1) + racc (1.7.3) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) rexml (3.2.6) - rouge (3.26.0) + rouge (3.30.0) ruby2_keywords (0.0.5) rubyzip (2.3.2) safe_yaml (1.0.5) @@ -242,15 +255,16 @@ GEM unf (~> 0.1.4) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) - typhoeus (1.4.0) + typhoeus (1.4.1) ethon (>= 0.9.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) unf (0.1.4) unf_ext - unf_ext (0.0.8.2) + unf_ext (0.0.9.1) unicode-display_width (1.8.0) - webrick (1.7.0) + uri (0.13.0) + webrick (1.8.1) PLATFORMS universal-darwin-21 @@ -259,9 +273,9 @@ PLATFORMS x86_64-linux DEPENDENCIES - github-pages (~> 228) - jekyll-seo-tag (~> 2.7) - webrick (~> 1.7) + github-pages (~> 231) + jekyll-seo-tag (~> 2.8) + webrick (~> 1.8.1) BUNDLED WITH 2.4.10