Adding CIS 52 for Fall 2024

.github/workflows/update_merrit_cis52.yml

@@ -0,0 +1,43 @@
+name: Update Popular Posts
+
+on:
+  schedule:
+    # Runs at 01:00 UTC every day
+    - cron: '0 1 * * *'
+  workflow_dispatch:  # Allows manual triggering
+
+jobs:
+  update-popular-posts:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Check out repository
+      uses: actions/checkout@v3
+
+    - name: Set up Python 3.9
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.9'
+
+    - name: Install Poetry
+      run: |
+        curl -sSL https://install.python-poetry.org | python3 -
+        echo "$HOME/.local/bin" >> $GITHUB_PATH
+
+    - name: Install dependencies
+      run: |
+        cd data-runners/yaml-datagen
+        poetry install
+
+    - name: Run update script
+      env:
+        GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
+      run: |
+        cd data-runners/yaml-datagen
+        echo "$GOOGLE_APPLICATION_CREDENTIALS" > google_credentials.json
+        poetry run python yaml_datagen.py --credentials-file google_credentials.json --input '1FSi3twUBvCw3qgODtFXqhizeNbOKuVPiMD3fM-AXP2Y' --output '../../_data/merrit-cis52-schedule.yml'
+    - name: Commit and push if changed
+      run: |
+        git config --global user.email "github-actions[bot]@users.noreply.github.com"
+        git config --global user.name "github-actions[bot]"
+        git add _data/popular_posts.yml
+        git diff --quiet && git diff --staged --quiet || (git commit -m "Update popular posts" && git push)

_config.yml

@@ -19,8 +19,10 @@ facebook: "https://www.facebook.com/thecyberdefendersprogram/"
 instagram: "https://www.instagram.com/cyberdefendersprogram/"
 merritthackapp: "https://docs.google.com/forms/d/e/1FAIpQLSeS0RISc0n2GfI_FA6rBJqiLA-VSG2-PCGNcp1BBH4FNPwJSA/viewform"
 
+
 # Build settings
 markdown: kramdown
 permalink: pretty
 exclude:
-  - package.json
+ - data-runners
+ - package.json

_data/merrit-cis52-schedule.yml

@@ -0,0 +1,40 @@
+- desc: Introduction into core concepts
+  notes: Nothing is due
+  recording_link: https://peralta-edu.zoom.us/rec/share/2P_YONWlI-kordYVhpqbNrhvsRweSyURoXsmwUhgTtCZT_4iKWk4Ho8Cls8sVZeR.4gdQDLqYG-sC-TWx
+  session: August 23
+  slides_link: https://docs.google.com/presentation/d/1zsqQ_EEg_PYRc1NMSKTgTiuKQN29ERSg1c-SlkFg-kQ/edit?usp=sharing
+- desc: Identity and Access Management
+  notes: 'Lab 1 Due at 9am
+
+    Quiz 1 from 1pm till 2:30pm'
+  recording_link: ''
+  session: August 30
+  slides_link: ''
+- desc: Security Tools
+  notes: 'Lab 2 Due at 9am
+
+    Quiz 2 from 1pm till 2:30pm'
+  recording_link: ''
+  session: September 6
+  slides_link: ''
+- desc: Monitoring
+  notes: 'Lab 3 Due at 9am
+
+    Quiz 3 from 1pm till 2:30pm'
+  recording_link: ''
+  session: September 13
+  slides_link: ''
+- desc: Host Security and Key Management
+  notes: 'Lab 4 Due at 9am
+
+    Quiz 4 from 1pm till 2:30pm'
+  recording_link: ''
+  session: September 20
+  slides_link: ''
+- desc: Detection and Response
+  notes: 'Lab 5 Due at 9am
+
+    Quiz 5 from 1pm till 2:30pm'
+  recording_link: ''
+  session: September 27
+  slides_link: ''

_data/merritt-cis52-2023-fall-schedule.yml

@@ -0,0 +1,40 @@
+- desc: Introduction into core concepts
+  notes: Nothing is due
+  recording_link: https://us02web.zoom.us/rec/play/F68e9yZepIwDLv7B54njjzEfT__UIwlrYV56lqq_N19mGjMILJhEH8S3FvqNph8k2oN-KRl7uI3ILktI.F1LnvvhFgecxwZua?canPlayFromShare=true&from=share_recording_detail&continueMode=true&componentName=rec-play&originRequestUrl=https%3A%2F%2Fus02web.zoom.us%2Frec%2Fshare%2F0NdNBrSQ1vOAHzDmJ_xxNelE38xnRKC7GVARy5u_aqPcNJf5bOE-gK1FCv3RZNk.caIC7RMLuucSWzKF
+  session: August 25
+  slides_link: https://docs.google.com/presentation/d/13YpL05Cl0Bn-anhLyy4D8ihgZHaHAk5bqB504X6vVFU/edit?usp=sharing
+- desc: Identity and Access Management
+  notes: 'Lab 1 Due at 9am
+
+    Quiz 1 from 1pm till 2:30pm'
+  recording_link: https://us02web.zoom.us/rec/play/0ZTOmpKFNV9uDksDc22JyEbuzp7ODiWOnnf0RGJEe_6ep2rDWgvOfxzV39dnE0Wcbmupa15Kk7F-urCG.ukKPJkrcqs7xbuNw?canPlayFromShare=true&from=share_recording_detail&continueMode=true&componentName=rec-play&originRequestUrl=https%3A%2F%2Fus02web.zoom.us%2Frec%2Fshare%2FWjiyWlgG8wB6yqGdvzkShjCnYYBGVyfEu2A7Wu1SIoRLyPzC7oGvVxrAw7bg_aW2.n6xm6aCdm0LXuaQu
+  session: September 1
+  slides_link: https://docs.google.com/presentation/d/1agSKCe2mhu8XcjtIBSxM5EtyoPCfRVCalpORnby8TAU/edit?usp=sharing
+- desc: Security Tools
+  notes: 'Lab 2 Due at 9am
+
+    Quiz 2 from 1pm till 2:30pm'
+  recording_link: https://us02web.zoom.us/rec/share/mbZbbdUASsg7dFrP3k9mszGq7G_oHiLg7cUeuG0LE8iQTGX1u2YGpu4CyNop_S3s.MShHZcMii0kQg5Sl
+  session: September 8
+  slides_link: https://docs.google.com/presentation/d/1841_c8EhhY5_clp_6t_6urdE8yC7wI1bQc4sAZL78oA/edit?usp=sharing
+- desc: Monitoring
+  notes: 'Lab 3 Due at 9am
+
+    Quiz 3 from 1pm till 2:30pm'
+  recording_link: https://us02web.zoom.us/rec/share/gH6bk9UBK9o7CLb_DryqxGlijdV5qmf6YghQLuegRFMnS0nqbmjMMk_Snbtp02Mp.7FSaO-gP0q64Qxt7
+  session: September 16
+  slides_link: https://docs.google.com/presentation/d/1CmCYr9aqJRDeefWpKj0iplRMcgbIvj7OZK0HMAKdfuc/edit?usp=sharing
+- desc: Host Security and Key Management
+  notes: 'Lab 4 Due at 9am
+
+    Quiz 4 from 1pm till 2:30pm'
+  recording_link: ''
+  session: September 22
+  slides_link: ''
+- desc: Detection and Response
+  notes: 'Lab 5 Due at 9am
+
+    Quiz 5 from 1pm till 2:30pm'
+  recording_link: ''
+  session: September 29
+  slides_link: ''

_data/merritt-cis52-schedule.yml

@@ -1,40 +1 @@
-- desc: Introduction into core concepts
-  notes: Nothing is due
-  recording_link: https://us02web.zoom.us/rec/play/F68e9yZepIwDLv7B54njjzEfT__UIwlrYV56lqq_N19mGjMILJhEH8S3FvqNph8k2oN-KRl7uI3ILktI.F1LnvvhFgecxwZua?canPlayFromShare=true&from=share_recording_detail&continueMode=true&componentName=rec-play&originRequestUrl=https%3A%2F%2Fus02web.zoom.us%2Frec%2Fshare%2F0NdNBrSQ1vOAHzDmJ_xxNelE38xnRKC7GVARy5u_aqPcNJf5bOE-gK1FCv3RZNk.caIC7RMLuucSWzKF
-  session: August 25
-  slides_link: https://docs.google.com/presentation/d/13YpL05Cl0Bn-anhLyy4D8ihgZHaHAk5bqB504X6vVFU/edit?usp=sharing
-- desc: Identity and Access Management
-  notes: 'Lab 1 Due at 9am
 
-    Quiz 1 from 1pm till 2:30pm'
-  recording_link: https://us02web.zoom.us/rec/play/0ZTOmpKFNV9uDksDc22JyEbuzp7ODiWOnnf0RGJEe_6ep2rDWgvOfxzV39dnE0Wcbmupa15Kk7F-urCG.ukKPJkrcqs7xbuNw?canPlayFromShare=true&from=share_recording_detail&continueMode=true&componentName=rec-play&originRequestUrl=https%3A%2F%2Fus02web.zoom.us%2Frec%2Fshare%2FWjiyWlgG8wB6yqGdvzkShjCnYYBGVyfEu2A7Wu1SIoRLyPzC7oGvVxrAw7bg_aW2.n6xm6aCdm0LXuaQu
-  session: September 1
-  slides_link: https://docs.google.com/presentation/d/1agSKCe2mhu8XcjtIBSxM5EtyoPCfRVCalpORnby8TAU/edit?usp=sharing
-- desc: Security Tools
-  notes: 'Lab 2 Due at 9am
-
-    Quiz 2 from 1pm till 2:30pm'
-  recording_link: https://us02web.zoom.us/rec/share/mbZbbdUASsg7dFrP3k9mszGq7G_oHiLg7cUeuG0LE8iQTGX1u2YGpu4CyNop_S3s.MShHZcMii0kQg5Sl
-  session: September 8
-  slides_link: https://docs.google.com/presentation/d/1841_c8EhhY5_clp_6t_6urdE8yC7wI1bQc4sAZL78oA/edit?usp=sharing
-- desc: Monitoring
-  notes: 'Lab 3 Due at 9am
-
-    Quiz 3 from 1pm till 2:30pm'
-  recording_link: https://us02web.zoom.us/rec/share/gH6bk9UBK9o7CLb_DryqxGlijdV5qmf6YghQLuegRFMnS0nqbmjMMk_Snbtp02Mp.7FSaO-gP0q64Qxt7
-  session: September 16
-  slides_link: https://docs.google.com/presentation/d/1CmCYr9aqJRDeefWpKj0iplRMcgbIvj7OZK0HMAKdfuc/edit?usp=sharing
-- desc: Host Security and Key Management
-  notes: 'Lab 4 Due at 9am
-
-    Quiz 4 from 1pm till 2:30pm'
-  recording_link: ''
-  session: September 22
-  slides_link: ''
-- desc: Detection and Response
-  notes: 'Lab 5 Due at 9am
-
-    Quiz 5 from 1pm till 2:30pm'
-  recording_link: ''
-  session: September 29
-  slides_link: ''

_includes/navbar.html

@@ -23,9 +23,9 @@
             <div class="navbar-item has-dropdown is-hoverable">
                 <a class="navbar-link">Programs</a>
                 <div class="navbar-dropdown">
-                  <a href="/cis-60" class="navbar-item">CIS 60 Computer Forensics Fundamentals (Merritt College)&nbsp;<span class="tag is-warning">In Session!</span></a>
+                  <a href="/cis-52" class="navbar-item">CIS 52 Cloud Security (Merritt College)&nbsp;<span class="tag is-info">In Session!</span></a>
+                  <a href="/cis-60" class="navbar-item">CIS 60 Computer Forensics Fundamentals (Merritt College)&nbsp;<span class="tag is-warning">Completed!</span></a>
                   <a href="/cis-55" class="navbar-item">CIS 55 Hacker Techniques (Merritt College)&nbsp;<span class="tag is-warning">Completed!</span></a>
-                  <a href="/cis-52" class="navbar-item">CIS 52 Cloud Security (Merritt College)&nbsp;<span class="tag is-info">Completed!</span></a>
                   <a href="/cd-growthsector-python-academy" class="navbar-item">2023 Growth Sector Python Academy&nbsp;<span class="tag is-info">Completed!</span></a>
                   <a href="/cyberexplorers-ncat" class="navbar-item">2023 NCAT CypherCoders Program&nbsp;<span class="tag is-info">Completed!</span></a>
                   <a href="/securityplus" class="navbar-item">Security+ Certification&nbsp;<span class="tag is-info">Done</span></a>
@@ -64,4 +64,4 @@
           </div>
         </div>
   </div>
-</nav>
+</nav>

data-runners/yaml-datagen/.gitignore

@@ -0,0 +1 @@
+dist/

_data/yaml-datagen/yaml_datagen.py → data-runners/yaml-datagen/yaml_datagen.py

@@ -3,13 +3,14 @@
 import yaml, os, csv
 from oauth2client.service_account import ServiceAccountCredentials
 
-def convert_google_spreadsheet_to_yaml(spreadsheet_id = '1yN3bmLLB_KuESmNqgiDEJgchy83cVZjVzdySJJCL9-s', sheet_name='roster', out_file=''):
+def convert_google_spreadsheet_to_yaml(spreadsheet_id = '1yN3bmLLB_KuESmNqgiDEJgchy83cVZjVzdySJJCL9-s', sheet_name='roster', out_file='', credentials_path="/Users/vaibhavb/.google/cyberdefenders/service_account.json"):
     """ Given a spreadsheet_id and sheet_name, convert it to a yaml """
     # Replace 'credentials.json' with the path to your credentials JSON file
     HOME=os.environ.get("HOME")
-    credentials = ServiceAccountCredentials.from_json_keyfile_name(HOME + "/.google/cyberdefenders/service_account.json", ['https://www.googleapis.com/auth/spreadsheets'])
+    credentials = ServiceAccountCredentials.from_json_keyfile_name(credentials_path, ['https://www.googleapis.com/auth/spreadsheets'])
     gc = gspread.authorize(credentials)
 
+
     # Replace 'your_spreadsheet_id' with the actual ID of your Google Spreadsheet
     spreadsheet = gc.open_by_key(spreadsheet_id)
 
@@ -44,6 +45,7 @@ def main():
     parser.add_argument('--input', default='1yN3bmLLB_KuESmNqgiDEJgchy83cVZjVzdySJJCL9-s', help='Input CSV file or Google Spreadsheet ID')
     parser.add_argument('--sheet', default='roster', help='Sheet name (only for Google Spreadsheet)')
     parser.add_argument('--output', help='Output YAML file')
+    parser.add_argument('--credentials-file', type=str, help='Path to Google Cloud credentials JSON file')
     args = parser.parse_args()
 
     if args.csv and not args.spreadsheet:

pages/programs/2023-fall-cis-52.md

@@ -0,0 +1,69 @@
+---
+layout: blog
+title: Merritt College CIS 52
+permalink: /2023-fall-cis-52/
+last_modified_at: 2023-08-11 08:12:05+00:00
+---
+<br/>
+<h1 class="title">CIS 52 Cloud Security (Merritt College)</h1>
+
+Cloud Security (Fall 2023)
+
+This is the second course in the infrastructure security major and it will expose students to the major concepts of Cloud Security.  Class will use a combination of lectures, required reading, essays, and hands-on labs to teach the course.
+
+<br/>
+<section>
+<div class="container">
+    <div class="columns is-multiline is-mobile is-centered">
+        <div class="column is-half">
+            <figure class="image">
+            <img src="{{site.url}}{{site.baseurl}}assets/images/merritt-cis-52.jpeg"/>
+            </figure>
+        </div>
+        <div class="column is-half">
+        <p class="has-text-left">   
+            <div>
+                <span class="tag is-danger">In Session!</span>
+                <br/> <br/>
+                <a class="tag is-info" href="#guestlecture">Guest Lecture</a>
+                <br/> <br/>
+                <a class="tag is-danger" href="/cis-52-quiz" target="_blank">Quiz</a>
+                <br/> <br/>
+            </div>
+            </p>
+        </div>
+    </div>
+</div>
+</section>
+
+<br/>
+<h1 class="title">Program details</h1>
+<table class="table is-bordered is-striped">
+    <thead>
+        <td>Session</td><td>Description</td><td>Notes</td><td>Slides</td><td>Recording</td>
+    </thead>
+    <tbody>
+    {% for session in site.data.merritt-fall-2023-cis52-schedule %} 
+    <tr>
+        <td><a id="{{session.session| url_encode}}" href="#{{session.session | url_encode}}">{{session.session}}</a></td>
+        <td>{{session.desc | markdownify}}</td>
+        <td>{{session.notes | markdownify}}</td>
+        {%if session.slides_link != "" %}
+        <td><a href="{{session.slides_link}}" class="tag is-info">Slides</a></td>
+        {% endif %}
+        {%if session.recording_link != "" %}
+        <td><a href="{{session.recording_link}}" class="tag is-info">Recording</a></td>
+        {% endif %}
+    </tr>
+    {% endfor %}
+    </tbody>
+</table>
+<br/>
+<hr/>
+
+<h2 id="guestlecture" class="subtitle">Course Outline</h2>
+<p> On Sep 22, 2023 we will have guest lecture from Keith Hodo.</p
+
+
+<hr/>
+Last Updated: {{page.last_modified_at}}

pages/programs/cis-52.md

@@ -7,17 +7,24 @@ last_modified_at: 2023-08-11 08:12:05+00:00
 <br/>
 <h1 class="title">CIS 52 Cloud Security (Merritt College)</h1>
 
-Cloud Security (Fall 2023)
+Cloud Security (Fall 2024)
 
 This is the second course in the infrastructure security major and it will expose students to the major concepts of Cloud Security.  Class will use a combination of lectures, required reading, essays, and hands-on labs to teach the course.
 
+Some additional important links below:
+- [Fall 2023 CIS 52 Class](/2023-fall-cis-52)
+- [Merritt College Cybersecurity Path - PDF](/assets/pdf/2024-merritt-career-path.pdf)
+- [Microsoft Cybersecurity Grant](https://www.lastmile-ed.org/microsoftcybersecurityscholarship)
+- [Collegiate Pentest Competition](https://cp.tc/), [Western Region Collegiate Defense Competition](https://wrccdc.org/), [NCL](https://nationalcyberleague.org/competition)
+- Preparation for the competitions [TryHackMe](https://tryhackme.com/), [HackTheBox](https://www.hackthebox.com/)
+
 <br/>
 <section>
 <div class="container">
     <div class="columns is-multiline is-mobile is-centered">
         <div class="column is-half">
             <figure class="image">
-            <img src="{{site.url}}{{site.baseurl}}assets/images/merritt-cis-55.jpeg"/>
+            <img src="{{site.url}}{{site.baseurl}}assets/images/merritt-cis-52.jpg"/>
             </figure>
         </div>
         <div class="column is-half">
@@ -66,4 +73,4 @@ This is the second course in the infrastructure security major and it will expos
 
 
 <hr/>
-Last Updated: {{page.last_modified_at}}
+Last Updated: {{page.last_modified_at}}