fixing issues.

Author: Farreeda

scripts/Generate_Site_mkDocs.sh

@@ -101,28 +101,13 @@ echo "Step 6/7: Generate URL shortcuts for all cheat sheets"
 echo "Current directory: $(pwd)"
 echo "WORK directory: $WORK"
 
-# Function to generate shortcut name from filename
-generate_shortcut() {
-    local filename=$1
-    local shortcut=""
-    
-    # Remove file extension and common suffixes
-    local basename=${filename%%.html}
-    basename=${basename%%_Cheat_Sheet}
-    
-    # For cheat sheets, use first letters of each word
-    shortcut=$(echo "$basename" | awk -F'_' '{for(i=1;i<=NF;i++)printf "%s", substr($i,1,1)}')
-    
-   # echo "$shortcut"
-}
-
 # Function to create redirect file
 create_redirect() {
     local shortcut=$1
     local target=$2
     local redirect_file="$WORK/site/${shortcut}"
 
-    #echo "Creating redirect: /${shortcut} -> ${target}"
+    echo "Creating redirect: /${shortcut} -> ${target}"
 
     # Create the redirect HTML file
     cat > "$redirect_file" << EOF
@@ -140,16 +125,20 @@ EOF
     # Also create .html version
     cp "$redirect_file" "${redirect_file}.html"
 
-    # Verify creation
+    # Verify creation and handle errors properly
     if [ -f "$redirect_file" ] && [ -f "${redirect_file}.html" ]; then
-       # echo "✅ Created shortcuts:"
+        echo "✅ Created shortcuts:"
         echo "  - /${shortcut}"
         echo "  - /${shortcut}.html"
     else
-        #echo "❌ Failed to create shortcuts for ${shortcut}"
+        echo "❌ Failed to create shortcuts for ${shortcut}"
+        return 1
     fi
 }
 
+# Track used shortcuts to prevent duplicates
+declare -A used_shortcuts
+
 # Process all cheat sheet files
 echo "Processing all cheat sheet files..."
 find "$WORK/site/cheatsheets" -type f -name "*_Cheat_Sheet.html" | while read -r file; do
@@ -158,27 +147,54 @@ find "$WORK/site/cheatsheets" -type f -name "*_Cheat_Sheet.html" | while read -r
 
     #echo "Processing: $filename"
 
-    # Generate shortcut name
-    shortcut=$(generate_shortcut "$filename")
+    # First try to find a match in redirects.yml
+    shortcut=""
+    if [ -f "redirects.yml" ]; then
+        # Try to find a matching redirect in the YAML file
+        while IFS=': ' read -r key target || [ -n "$key" ]; do
+            # Skip comments and empty lines
+            [[ $key =~ ^#.*$ ]] && continue
+            [ -z "$key" ] && continue
+            
+            # Trim whitespace
+            key=$(echo "$key" | xargs)
+            target=$(echo "$target" | xargs)
+            
+            if [ "$target" = "$filepath" ]; then
+                shortcut=$key
+                break
+            fi
+        done < "redirects.yml"
+    fi
 
-    # Skip if no shortcut generated
-    [ -z "$shortcut" ] && continue
+    # If no shortcut found in redirects.yml, generate one
+    if [ -z "$shortcut" ]; then
+        # Generate shortcut from filename
+        shortcut=$(echo "$filename" | awk -F'_' '{for(i=1;i<=NF;i++)printf "%s", substr($i,1,1)}' | tr '[:lower:]' '[:upper:]')
+    fi
 
-    # Convert to uppercase
-    #shortcut=$(echo "$shortcut" | tr '[:lower:]' '[:upper:]')
+    # Handle duplicate shortcuts
+    if [ "${used_shortcuts[$shortcut]}" ]; then
+        echo "⚠️ Warning: Duplicate shortcut '$shortcut' for '$filename'. Original was for '${used_shortcuts[$shortcut]}'"
+        # Append a number to make it unique
+        count=2
+        while [ "${used_shortcuts[${shortcut}${count}]}" ]; do
+            ((count++))
+        done
+        shortcut="${shortcut}${count}"
+    fi
+    
+    # Record this shortcut as used
+    used_shortcuts[$shortcut]=$filepath
 
     # Create redirect
     create_redirect "$shortcut" "$filepath"
 done
 
 # Print all available shortcuts
-#echo "Available shortcuts:"
-for file in "$WORK"/site/[A-Z]*; do
-    if [ -f "$file" ] && [[ ! "$file" =~ \.(html|xml|gz)$ ]]; then
-        shortcut=$(basename "$file")
-        target=$(grep -o 'url=/[^"]*' "$file" | cut -d'=' -f2)
-        #echo "- /${shortcut} -> ${target}"
-    fi
+echo "Available shortcuts:"
+for shortcut in "${!used_shortcuts[@]}"; do
+    echo "- /${shortcut} -> ${used_shortcuts[$shortcut]}"
 done
 
 echo "Step 7/7 Cleanup."
@@ -187,3 +203,54 @@ rm -rf custom_theme
 rm mkdocs.yml
 
 echo "Generation finished to the folder: $WORK/$GENERATED_SITE"
+
+# Add redirect handling
+echo "Generating redirect pages..."
+mkdir -p $WORK/$GENERATED_SITE/redirects
+
+# Process redirects.yml and generate redirect HTML files
+#SITE_DIR="$WORK/$GENERATED_SITE"
+python3 - <<EOF
+import yaml
+import os
+
+REDIRECT_TEMPLATE = """
+<!DOCTYPE html>
+<html>
+<head>
+    <meta http-equiv="refresh" content="0;url={target_url}">
+    <script>window.location.href = "{target_url}";</script>
+</head>
+<body>
+    Redirecting to <a href="{target_url}">{target_url}</a>...
+</body>
+</html>
+"""
+
+def create_redirect_page(shortcut, target_url, output_dir):
+    # Handle relative URLs
+    if not target_url.startswith('http'):
+        target_url = f'/{target_url}'
+    
+    content = REDIRECT_TEMPLATE.format(target_url=target_url)
+    
+    # Create redirect file
+    with open(f'{output_dir}/{shortcut}.html', 'w') as f:
+        f.write(content)
+
+# Load redirects
+with open('../scripts/redirects.yml', 'r') as f:
+    try:
+        redirects = yaml.safe_load(f)
+    except yaml.YAMLError as e:
+        print(f"Error parsing redirects.yml: {e}")
+        exit(1)
+
+# Create redirect pages
+output_dir = '$WORK/$GENERATED_SITE'
+for shortcut, target in redirects.items():
+    create_redirect_page(shortcut, target, output_dir)
+    print(f"Created redirect: {shortcut} -> {target}")
+
+EOF
+

scripts/redirects.yml

@@ -1,11 +1,27 @@
+# Common cheatsheet shortcuts
+xss: cheatsheets/Cross_Site_Scripting_Prevention_Cheat_Sheet.html
+auth: cheatsheets/Authentication_Cheat_Sheet.html
+injection: cheatsheets/SQL_Injection_Prevention_Cheat_Sheet.html
+csrf: cheatsheets/Cross-Site_Request_Forgery_Prevention_Cheat_Sheet.html
+
+# Common guide shortcuts
+newdev: cheatsheets/Guide_for_New_Developers.html
+secarch: cheatsheets/Security_Architecture_Cheat_Sheet.html
+
+# Tool shortcuts
+webgoat: https://owasp.org/www-project-webgoat/
+juice: https://owasp.org/www-project-juice-shop/
+
+# Legacy redirects
+old_xss: cheatsheets/Cross_Site_Scripting_Prevention_Cheat_Sheet.html  # Maintain backwards compatibility
+
 # Direct topic shortcuts
 SSRF: cheatsheets/Server_Side_Request_Forgery_Prevention_Cheat_Sheet.html
 XSS: cheatsheets/Cross_Site_Scripting_Prevention_Cheat_Sheet.html
 SQLi: cheatsheets/SQL_Injection_Prevention_Cheat_Sheet.html
 JWT: cheatsheets/JSON_Web_Token_for_Java_Cheat_Sheet.html
 DOS: cheatsheets/Denial_of_Service_Cheat_Sheet.html
-Auth: cheatsheets/Authentication_Cheat_Sheet.html
-CSRF: cheatsheets/Cross-Site_Request_Forgery_Prevention_Cheat_Sheet.html
+XSRF: cheatsheets/Cross-Site_Request_Forgery_Prevention_Cheat_Sheet.html
 Docker: cheatsheets/Docker_Security_Cheat_Sheet.html
 GraphQL: cheatsheets/GraphQL_Cheat_Sheet.html
 K8S: cheatsheets/Kubernetes_Security_Cheat_Sheet.html