AniNIX/Kapisi
3
0
Fork 0
Code Issues 27 Pull Requests Projects 1 Releases Wiki Activity

Compare commits

merge into: AniNIX:improved-ipam
Branches Tags
AniNIX:main AniNIX:improved-ipam AniNIX:25u
AniNIX:0.0
...
pull from: AniNIX:25u
Branches Tags
AniNIX:improved-ipam AniNIX:25u AniNIX:main
AniNIX:0.0

6 Commits
improved-i ... 25u

Author SHA1 Message Date
DarkFeather
e2352f203b Adding enforcement exit code 2024-01-18 12:04:49 -06:00
DarkFeather
d7db9b5b9f Adding commentary header 2024-01-18 12:02:49 -06:00
DarkFeather
3845470bb7 Extending for WAPs 2024-01-16 16:34:30 -06:00
DarkFeather
15b1d9dcc0 Adding routing page 2024-01-16 14:56:43 -06:00
DarkFeather
6d52c6771f Removing ambiguous character 2024-01-15 11:13:41 -06:00
DarkFeather
87adb4e14d 25U subnetting app 2024-01-12 20:03:08 -06:00
4 changed files with 143 additions and 0 deletions
Expand all files Collapse all files

3
precommit-hooks/ensure-apps-are-short
View File

@@ -2,8 +2,11 @@
# Webserver apps directory should be short -- apps that fail this category should become their own. # Webserver apps directory should be short -- apps that fail this category should become their own.
retcode=0
for file in `find roles/WebServer/files/apps -type f`; do for file in `find roles/WebServer/files/apps -type f`; do
if [[ $(wc -l "$file" | awk '{ print $1; }') -gt 10 ]]; then if [[ $(wc -l "$file" | awk '{ print $1; }') -gt 10 ]]; then
echo "$file" is too long to be deployed as a mini-app under the WebServer role. echo "$file" is too long to be deployed as a mini-app under the WebServer role.
retcode=1
fi fi
done done
exit $retcode

75
roles/WebServer/files/apps/25u/routing.php Normal file
View File

@@ -0,0 +1,75 @@
<?php
# File: routing.php
#
# Description: This page is to render an example printout for students to test routing
# from within the network emulation software.
#
# Package: 25U MOS-T Tools
# Copyright: DoD
#
# Author: SPC Ford with 421 RTI 25U MOS-T Class 001-24
echo '<html>
<head>
<title>25U Routing Practice</title>
</head>
<body>';
//Example picture
echo '<img src=/assets/25u/example_network2.png style="width:100%;height:auto;" />';
echo '<h3>IP Chart</h3>';
// RFC1918
$seed = rand(1,3);
switch($seed) {
case 1: $base="10.".rand(0,255) ; break;
case 2: $base="172.".rand(16,31) ; break;
case 3: $base="192.168" ; break;
}
// Random Class C
$thirdoctet=rand(0,255);
// Find three nonidentical nets
$netid1=rand(0,7);
$netid2=$netid1;
while ($netid2==$netid1) {
$netid2=rand(0,7);
}
$netid3=$netid1;
while ($netid1==$netid3 OR $netid2==$netid3) {
$netid3=rand(0,7);
}
// Format display
$displaynet1 = $base.'.'.$thirdoctet.'.'.($netid1*32).'/'.rand(27,29);
$displaynet2 = $base.'.'.$thirdoctet.'.'.($netid2*32).'/'.rand(27,29);
$displaynet3 = $base.'.'.$thirdoctet.'.'.($netid3*32).'/30';
// Render
echo '<table style="width:100%;"><tr><th style="width:150px;">Device</th><th style="width:150px;">Interface</th><th style="width:150px;">NetID</th><th style="width:150px;">IP Address</th></tr>';
echo '
<tr><th style="border: 1px solid;" colspan=4>Network 3</th style="border: 1px solid;"></tr>
<tr><td style="border:1px solid;">RTR1</td style="border:1px solid;"><td style="border:1px solid;">G0/1</td style="border:1px solid;"><td style="border:1px solid;">'.$displaynet3.'<td style="border:1px solid;">&nbsp;</td style="border:1px solid;"></tr>
<tr><td style="border:1px solid;">RTR2</td style="border:1px solid;"><td style="border:1px solid;">G0/1</td style="border:1px solid;"><td style="border:1px solid;">'.$displaynet3.'<td style="border:1px solid;">&nbsp;</td style="border:1px solid;"></tr>
<tr><th style="border: 1px solid;" colspan=4>Network 1</th style="border: 1px solid;"></tr>
<tr><td style="border:1px solid;">RTR1</td style="border:1px solid;"><td style="border:1px solid;">G0/0</td style="border:1px solid;"><td style="border:1px solid;">'.$displaynet1.'<td style="border:1px solid;">&nbsp;</td style="border:1px solid;"></tr>
<tr><td style="border:1px solid;">SW1</td style="border:1px solid;"><td style="border:1px solid;">VLAN 1</td style="border:1px solid;"><td style="border:1px solid;">'.$displaynet1.'<td style="border:1px solid;">&nbsp;</td style="border:1px solid;"></tr>
<tr><td style="border:1px solid;">PC1</td style="border:1px solid;"><td style="border:1px solid;">NIC</td style="border:1px solid;"><td style="border:1px solid;">'.$displaynet1.'<td style="border:1px solid;">&nbsp;</td style="border:1px solid;"></tr>
<tr><td style="border:1px solid;">WAP1</td style="border:1px solid;"><td style="border:1px solid;">NIC</td style="border:1px solid;"><td style="border:1px solid;">'.$displaynet1.'<td style="border:1px solid;">&nbsp;</td style="border:1px solid;"></tr>
<tr><td style="border:1px solid;">LTP1</td style="border:1px solid;"><td style="border:1px solid;">Wireless</td style="border:1px solid;"><td style="border:1px solid;">'.$displaynet1.'<td style="border:1px solid;">&nbsp;</td style="border:1px solid;"></tr>
<tr><td style="border:1px solid;">Printer 1</td style="border:1px solid;"><td style="border:1px solid;">Wireless</td style="border:1px solid;"><td style="border:1px solid;">'.$displaynet1.'<td style="border:1px solid;">&nbsp;</td style="border:1px solid;"></tr>
<tr><th style="border: 1px solid;" colspan=4>Network 2</th style="border: 1px solid;"></tr>
<tr><td style="border:1px solid;">RTR2</td style="border:1px solid;"><td style="border:1px solid;">G0/0</td style="border:1px solid;"><td style="border:1px solid;">'.$displaynet2.'<td style="border:1px solid;">&nbsp;</td style="border:1px solid;"></tr>
<tr><td style="border:1px solid;">SW2</td style="border:1px solid;"><td style="border:1px solid;">VLAN 1</td style="border:1px solid;"><td style="border:1px solid;">'.$displaynet2.'<td style="border:1px solid;">&nbsp;</td style="border:1px solid;"></tr>
<tr><td style="border:1px solid;">PC2</td style="border:1px solid;"><td style="border:1px solid;">NIC</td style="border:1px solid;"><td style="border:1px solid;">'.$displaynet2.'<td style="border:1px solid;">&nbsp;</td style="border:1px solid;"></tr>
<tr><td style="border:1px solid;">WAP2</td style="border:1px solid;"><td style="border:1px solid;">NIC</td style="border:1px solid;"><td style="border:1px solid;">'.$displaynet2.'<td style="border:1px solid;">&nbsp;</td style="border:1px solid;"></tr>
<tr><td style="border:1px solid;">LTP2</td style="border:1px solid;"><td style="border:1px solid;">Wireless</td style="border:1px solid;"><td style="border:1px solid;">'.$displaynet2.'<td style="border:1px solid;">&nbsp;</td style="border:1px solid;"></tr>
<tr><td style="border:1px solid;">Printer 2</td style="border:1px solid;"><td style="border:1px solid;">Wireless</td style="border:1px solid;"><td style="border:1px solid;">'.$displaynet2.'<td style="border:1px solid;">&nbsp;</td style="border:1px solid;"></tr>
';
echo '</table>';
echo '</body></html>';

56
roles/WebServer/files/apps/25u/subnetting.php Normal file
View File

@@ -0,0 +1,56 @@
<?php
# File: subnetting.php
#
# Description: This page is to render an example printout for students to test subnetting
# and binary conversions by hand.
#
# Package: 25U MOS-T Tools
# Copyright: DoD
#
# Author: SPC Ford with 421 RTI 25U MOS-T Class 001-24
echo '<html>
<head>
<title>25U Subnetting Practice</title>
</head>
<body>';
// Binary conversions
echo '<h3>Convert the following to binary:</h3>';
for ($x = 0; $x <= 3; $x++) {
echo '<p>'.rand(0,256).' ____________________</p>';
}
// Decimal conversions
echo '<h3>Convert the following to decimal:</h3>';
for ($x = 0; $x <= 3; $x++) {
echo '<p>';
for ($y = 0; $y <= 7; $y++) {
echo rand(0,1);
}
echo ' ____________________</p>';
}
// CIDRs
echo '<h3>Convert the following slash notations to decimal and binary:</h3><table style="width:100%;"><tr><th style="width:30%;">Slash</th><th style="width:30%;">Decimal</th><th style="width:30%;">Binary</th></tr>';
for ($x = 0; $x <= 3; $x++) {
echo '<tr><td style="border: 1px solid;">'.rand(16,32).'</td><td style="border: 1px solid;">&nbsp;</td><td style="border: 1px solid;">&nbsp;</td>';
}
echo '</table>';
//Subnets
echo '<h3>Identify the following for these CIDRs:</h3>';
echo '<table style="width:100%;"><tr><th style="width:150px;">IP/CIDR</th><th style="width:150px;">SM</th><th style="width:150px;">NetID</th><th style="width:150px;">Host Range</th><th style="width:150px;">Broadcast</th><th style="width:150px;">Gateway</th><th style="width:150px;">Increment</th></tr>';
for ($x = 0; $x <= 6; $x++) {
echo '<tr><td style="border: 1px solid;">'.rand(0,256).'.'.rand(0,256).'.'.rand(0,256).'.'.rand(0,256).'/'.rand(16,32).'</td><td style="border: 1px solid;">&nbsp;</td><td style="border: 1px solid;">&nbsp;</td><td style="border: 1px solid;">&nbsp;</td><td style="border: 1px solid;">&nbsp;</td><td style="border: 1px solid;">&nbsp;</td><td style="border: 1px solid;">&nbsp;</td></tr>';
}
echo '</table>';
echo '<h3>Bonus: Calculate the three subnets that follow each of the above.</h3>';
echo '</body></html>';

9
roles/WebServer/files/conf.d/Yggdrasil/aaa_default.conf
View File

@@ -34,6 +34,15 @@ server {
rewrite /martialarts/maqotw.xml /MartialArts/Wiki/raw/branch/main/rss/maqotw.xml; rewrite /martialarts/maqotw.xml /MartialArts/Wiki/raw/branch/main/rss/maqotw.xml;
} }
location /25u {
include conf.d/fastcgi.config;
root /usr/share/webapps/aninix/;
location ~* 25u {
try_files $uri /25u_subnetting.php;
expires max;
}
}
location /whatismyip { location /whatismyip {
include conf.d/fastcgi.config; include conf.d/fastcgi.config;
root /usr/share/webapps/aninix/; root /usr/share/webapps/aninix/;