From bee8b4a9810cd007d697cd6e1ce6f27f80d7c456 Mon Sep 17 00:00:00 2001
From: "Z. Cliffe Schreuders" <code.cliffe@schreuders.org>
Date: Wed, 21 Apr 2021 16:38:17 +0100
Subject: [PATCH] CyBOK metadata

---
 lib/schemas/scenario_schema.xsd               | 10 +-
 scenarios/examples/cybok_example.xml          |  6 +-
 .../examples/cybok_example_no_systems.xml     |  7 +-
 .../ads_1_authentication.xml                  | 61 +++++++++++-
 .../ads_2_pam.xml                             | 97 +++++++++++++++++++
 5 files changed, 169 insertions(+), 12 deletions(-)

diff --git a/lib/schemas/scenario_schema.xsd b/lib/schemas/scenario_schema.xsd
index 285eea01f..9e8c949e8 100644
--- a/lib/schemas/scenario_schema.xsd
+++ b/lib/schemas/scenario_schema.xsd
@@ -51,21 +51,23 @@
 
   <xs:complexType name="VideoType">
     <xs:sequence>
-      <xs:element name="url" type="xs:string" minOccurs="1" maxOccurs="1"/>
       <xs:element name="title" type="xs:string" minOccurs="1" maxOccurs="1"/>
+      <xs:element name="by" type="xs:string" minOccurs="1" maxOccurs="1"/>
+      <xs:element name="url" type="xs:string" minOccurs="1" maxOccurs="1"/>
       <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1"/>
       <xs:element name="CyBOK" type="CyBOKType" minOccurs="0" maxOccurs="unbounded" />
+      <xs:element name="type" type="xs:string" minOccurs="0" maxOccurs="1"/>
     </xs:sequence>
-    <xs:attribute name="type" type="xs:string"/>
   </xs:complexType>
 
   <xs:complexType name="ReadingType">
     <xs:sequence>
-      <xs:element name="url" type="xs:string" minOccurs="1" maxOccurs="1"/>
       <xs:element name="title" type="xs:string" minOccurs="1" maxOccurs="1"/>
+      <xs:element name="by" type="xs:string" minOccurs="1" maxOccurs="1"/>
+      <xs:element name="url" type="xs:string" minOccurs="1" maxOccurs="1"/>
       <xs:element name="CyBOK" type="CyBOKType" minOccurs="0" maxOccurs="unbounded" />
+      <xs:element name="type" type="xs:string" minOccurs="0" maxOccurs="1"/>
     </xs:sequence>
-    <xs:attribute name="type" type="xs:string"/>
   </xs:complexType>
 
   <xs:complexType name="SystemType">
diff --git a/scenarios/examples/cybok_example.xml b/scenarios/examples/cybok_example.xml
index 1a71ca8a7..94b25e03d 100644
--- a/scenarios/examples/cybok_example.xml
+++ b/scenarios/examples/cybok_example.xml
@@ -34,8 +34,9 @@
 	<!-- Zero to many videos, with zero to many CyBOK areas: -->
 
 	<video>
-		<url>www.example.com</url>
 		<title>A video!</title>
+		<by>Somebody</by>
+		<url>www.example.com</url>
 		<description>This is the text section of the video description.</description>
 		<CyBOK KA="OSV" topic="OS Security Principles">
 			<keyword>security models</keyword>
@@ -44,8 +45,9 @@
 
 	<!-- Zero to many readings, with zero to many CyBOK areas: -->
 	<reading>
-		<url>www.example2.com</url>
 		<title>An article to read</title>
+		<by>Somebody</by>
+		<url>www.example2.com</url>
 		<CyBOK KA="OSV" topic="OS Security Principles">
 			<keyword>security models</keyword>
 		</CyBOK>
diff --git a/scenarios/examples/cybok_example_no_systems.xml b/scenarios/examples/cybok_example_no_systems.xml
index 46dd9bdc3..ca865a5d7 100644
--- a/scenarios/examples/cybok_example_no_systems.xml
+++ b/scenarios/examples/cybok_example_no_systems.xml
@@ -30,8 +30,10 @@
 
 	<!-- Zero to many videos, with zero to many CyBOK areas: -->
 	<video>
-		<url>www.example.com</url>
 		<title>A video!</title>
+		<by>Somebody</by>
+		<url>www.example.com</url>
+		<type>lecture-prerecorded</type>
 		<description>This is the text section of the video description.</description>
 		<CyBOK KA="OSV" topic="OS Security Principles">
 			<keyword>security models</keyword>
@@ -40,8 +42,9 @@
 
 	<!-- Zero to many readings, with zero to many CyBOK areas: -->
 	<reading>
-		<url>www.example2.com</url>
 		<title>An article to read</title>
+		<by>Somebody</by>
+		<url>www.example2.com</url>
 		<CyBOK KA="OSV" topic="OS Security Principles">
 			<keyword>security models</keyword>
 		</CyBOK>
diff --git a/scenarios/labs/authentication_and_access_controls/ads_1_authentication.xml b/scenarios/labs/authentication_and_access_controls/ads_1_authentication.xml
index df7f3a8f1..866299d87 100644
--- a/scenarios/labs/authentication_and_access_controls/ads_1_authentication.xml
+++ b/scenarios/labs/authentication_and_access_controls/ads_1_authentication.xml
@@ -8,10 +8,6 @@
   <author>Z. Cliffe Schreuders</author>
   <description>
 # Lecture
-[Click here to watch the lecture authentication part 1](https://leedsbeckettreplay.cloud.panopto.eu/Panopto/Pages/Viewer.aspx?id=c5ea9ea3-b8c2-4949-a251-a9e500ad23f4)
-
-[Click here to watch authentication part 2](https://leedsbeckettreplay.cloud.panopto.eu/Panopto/Pages/Viewer.aspx?id=c49f1c3a-1688-4013-b1a8-a9ec00a5a30f)
-
 [Slides here](http://z.cliffe.schreuders.org/presentations/slides/1718/ADS_slides_out_week_6/WNS_ADS_Lectures_5_Authentication.html)
 
 # Reading
@@ -38,6 +34,63 @@ A Hackerbot lab. Work through the lab instructions, then when prompted interact
 		<keyword>Types of user accounts</keyword>
 	</CyBOK>
 
+	<video>
+		<title>User accounts and Linux</title>
+		<by>Z. Cliffe Schreuders</by>
+		<url>https://youtu.be/2I_JSdTu-oI</url>
+		<type>lecture-prerecorded</type>
+		<CyBOK KA="AAA" topic="Authentication">
+			<keyword>user authentication</keyword>
+		</CyBOK>
+		<CyBOK KA="OSVS" topic="Primitives for Isolation and Mediation">
+			<keyword>authentication and identification</keyword>
+			<keyword>Linux authentication</keyword>
+			<keyword>Types of user accounts</keyword>
+		</CyBOK>
+	</video>
+	<video>
+		<title>Passwords Part 1 Hashing and salt</title>
+		<by>Z. Cliffe Schreuders</by>
+		<url>https://youtu.be/pGcJEML1mRo</url>
+		<type>lecture-prerecorded</type>
+		<CyBOK KA="AAA" topic="Authentication">
+			<keyword>user authentication</keyword>
+			<keyword>Cryptography and authentication (hashes and attacks against authentication schemes / passwords)</keyword>
+		</CyBOK>
+		<CyBOK KA="OSVS" topic="Primitives for Isolation and Mediation">
+			<keyword>authentication and identification</keyword>
+			<keyword>Linux authentication</keyword>
+		</CyBOK>
+	</video>
+	<video>
+		<title>Passwords Part 2 Attacks and Countermeasures</title>
+		<by>Z. Cliffe Schreuders</by>
+		<url>https://youtu.be/icC2Zrno_uM</url>
+		<type>lecture-prerecorded</type>
+		<CyBOK KA="AAA" topic="Authentication">
+			<keyword>user authentication</keyword>
+			<keyword>Cryptography and authentication (hashes and attacks against authentication schemes / passwords)</keyword>
+		</CyBOK>
+		<CyBOK KA="OSVS" topic="Primitives for Isolation and Mediation">
+			<keyword>authentication and identification</keyword>
+			<keyword>Linux authentication</keyword>
+		</CyBOK>
+	</video>
+	<video>
+		<title>Password cracking with Johnny</title>
+		<by>Z. Cliffe Schreuders</by>
+		<url>https://youtu.be/Wrg6XZu6Luw</url>
+		<type>demo-prerecorded</type>
+		<CyBOK KA="AAA" topic="Authentication">
+			<keyword>user authentication</keyword>
+			<keyword>Cryptography and authentication (hashes and attacks against authentication schemes / passwords)</keyword>
+		</CyBOK>
+		<CyBOK KA="OSVS" topic="Primitives for Isolation and Mediation">
+			<keyword>authentication and identification</keyword>
+			<keyword>Linux authentication</keyword>
+		</CyBOK>
+	</video>
+
 	<system>
 		<system_name>desktop</system_name>
 		<base distro="Debian 10" type="desktop" name="KDE"/>
diff --git a/scenarios/labs/authentication_and_access_controls/ads_2_pam.xml b/scenarios/labs/authentication_and_access_controls/ads_2_pam.xml
index 6df93dc48..07237fb2f 100644
--- a/scenarios/labs/authentication_and_access_controls/ads_2_pam.xml
+++ b/scenarios/labs/authentication_and_access_controls/ads_2_pam.xml
@@ -35,6 +35,103 @@ A short lab this week, exploring PAM. Work through the labsheet, then when promp
 		<keyword>Authentication frameworks (PAM)</keyword>
 	</CyBOK>
 
+	<video>
+		<title>Authentication</title>
+		<by>Z. Cliffe Schreuders</by>
+		<url>https://youtu.be/z4L6Yv5ry1A</url>
+		<type>lecture-prerecorded</type>
+		<CyBOK KA="AAA" topic="Authentication">
+			<keyword>identity management</keyword>
+			<keyword>user authentication</keyword>
+			<keyword>facets of authentication</keyword>
+		</CyBOK>
+		<CyBOK KA="OSVS" topic="Primitives for Isolation and Mediation">
+			<keyword>authentication and identification</keyword>
+			<keyword>Linux authentication</keyword>
+		</CyBOK>
+	</video>
+	<video>
+		<title>Biometrics</title>
+		<by>Z. Cliffe Schreuders</by>
+		<url>https://youtu.be/-zcnfmoLjYI</url>
+		<type>lecture-prerecorded</type>
+		<CyBOK KA="AAA" topic="Authentication">
+			<keyword>identity management</keyword>
+			<keyword>user authentication</keyword>
+			<keyword>facets of authentication</keyword>
+			<keyword>AUTHENTICATION - BIOMETRICS</keyword>
+		</CyBOK>
+	</video>
+	<video>
+		<title>Authentication Tokens and One-Time Passwords</title>
+		<by>Z. Cliffe Schreuders</by>
+		<url>https://youtu.be/xHs3LB4Yyrk</url>
+		<type>lecture-prerecorded</type>
+		<CyBOK KA="AAA" topic="Authentication">
+			<keyword>identity management</keyword>
+			<keyword>user authentication</keyword>
+			<keyword>facets of authentication</keyword>
+			<keyword>AUTHENTICATION - OTP (ONE-TIME PASSWORD)</keyword>
+			<keyword>AUTHENTICATION - TOKENS</keyword>
+		</CyBOK>
+	</video>
+
+	<video>
+		<title>Network-based Authentication (SSO, AD, LDAP, Kerberos)</title>
+		<by>Z. Cliffe Schreuders</by>
+		<url>https://youtu.be/c2dPdQmaVyo</url>
+		<type>lecture-prerecorded</type>
+		<CyBOK KA="AAA" topic="Authentication">
+			<keyword>authentication in distributed systems</keyword>
+			<keyword>user authentication</keyword>
+		</CyBOK>
+		<CyBOK KA="AAA" topic="Authorisation">
+			<keyword>theory</keyword>
+			<keyword>AUTHORIZATION - SSO (SINGLE SIGN-ON)</keyword>
+			<keyword>AUTHORIZATION - LDAP (LIGHTWEIGHT DIRECTORY ACCESS PROTOCOL)</keyword>
+			<keyword>AUTHENTICATION - KERBEROS</keyword>
+			<keyword>ACTIVE DIRECTORY DOMAIN SERVICES (ADDS)</keyword>
+			<keyword>Network based-authentication with heterogeneous Linux and Windows networks</keyword>
+		</CyBOK>
+		<CyBOK KA="AAA" topic="Access Control in Distributed Systems">
+			<keyword>core concepts</keyword>
+			<keyword>federated access control</keyword>
+		</CyBOK>
+	</video>
+	<video>
+		<title>Lightweight Directory Access Protocol (LDAP)</title>
+		<by>Z. Cliffe Schreuders</by>
+		<url>https://youtu.be/dCBabesIXo8</url>
+		<type>lecture-prerecorded</type>
+		<CyBOK KA="AAA" topic="Authentication">
+			<keyword>identity management</keyword>
+			<keyword>user authentication</keyword>
+			<keyword>facets of authentication</keyword>
+		</CyBOK>
+	</video>
+	<video>
+		<title>Kerberos overview</title>
+		<by>Z. Cliffe Schreuders</by>
+		<url>https://youtu.be/rhdcxhSDqp4</url>
+		<type>lecture-prerecorded</type>
+		<CyBOK KA="AAA" topic="Authentication">
+			<keyword>identity management</keyword>
+			<keyword>user authentication</keyword>
+			<keyword>facets of authentication</keyword>
+		</CyBOK>
+	</video>
+	<video>
+		<title>Active Directory</title>
+		<by>Z. Cliffe Schreuders</by>
+		<url>https://youtu.be/PCXK2cK8tpE</url>
+		<type>lecture-prerecorded</type>
+		<CyBOK KA="AAA" topic="Authentication">
+			<keyword>identity management</keyword>
+			<keyword>user authentication</keyword>
+			<keyword>facets of authentication</keyword>
+		</CyBOK>
+	</video>
+
 	<system>
 		<system_name>desktop</system_name>
 		<base distro="Debian 10" type="desktop" name="KDE"/>