Merge branch 'butteroverfl0w-master'

puzzithinker · Jun 14, 2022 · 8d57e3b · 8d57e3b
2 parents 89e5fbc + aab6de2
commit 8d57e3b
Show file tree

Hide file tree

Showing 14 changed files with 33 additions and 31 deletions.
diff --git a/FAQ.md b/FAQ.md
@@ -42,10 +42,10 @@ And add `-H deeplists.tex` option to pandoc CLI when generating the PDF.
 Example:
 
 ```
-![ImgPlaceholder](src/placeholder-image-300x225.png)
+![ImgPlaceholder](img/placeholder-image-300x225.png)
 ```
 
-The path is relative from the generating script not from the markdown template!
+The path can be relative from the generating script or the `src` folder. You can adjust this behavior by editing the `--resource-path` option in the `generate.rb` script. For possible options, see [pandoc options](https://pandoc.org/MANUAL.html#general-options). 
 
 ## Syntax highlight style ignored when no language provided
 

diff --git a/README.md b/README.md
@@ -76,6 +76,7 @@ pandoc src/OSCP-exam-report-template_whoisflynn_v3.2.md \
 --number-sections \
 --top-level-division=chapter \
 --highlight-style breezedark
+--resource-path=.:src
 ```
 
 You can change the code syntax highlight theme with [`--highlight-style`](https://pandoc.org/MANUAL.html#option--highlight-style).

diff --git a/generate.rb b/generate.rb
@@ -101,7 +101,8 @@
   --toc-depth 6 \
   --number-sections \
   --top-level-division=chapter \
-  --highlight-style #{style}
+  --highlight-style #{style} \
+  --resource-path=.:src
 )
 puts "\n[+] PDF generated at #{pdf}"
 

diff --git a/src/OSCE-exam-report-template_OS_v1.md b/src/OSCE-exam-report-template_OS_v1.md
@@ -68,7 +68,7 @@ Provide the final proof of concept code used to gain access to the server.
 
 Provide a screenshot of the id command and the contents of proof.txt.
 
-![ImgPlaceholder](src/placeholder-image-300x225.png)
+![ImgPlaceholder](img/placeholder-image-300x225.png)
 
 ## Steps
 
@@ -80,7 +80,7 @@ Provide a detailed account of your methodology in creating the exploit. The step
 
 Screenshot requirements are detailed in the control panel.
 
-![ImgPlaceholder](src/placeholder-image-300x225.png)
+![ImgPlaceholder](img/placeholder-image-300x225.png)
 
 ## Steps
 
@@ -96,7 +96,7 @@ Provide the final proof of concept code used to gain access to the server.
 
 Screenshot requirements are detailed in the control panel.
 
-![ImgPlaceholder](src/placeholder-image-300x225.png)
+![ImgPlaceholder](img/placeholder-image-300x225.png)
 
 ## Steps
 

diff --git a/src/OSCP-exam-report-template_OS_v1.md b/src/OSCP-exam-report-template_OS_v1.md
@@ -181,7 +181,7 @@ except:
 print "\nDone."
 ```
 
-![ImgPlaceholder](src/placeholder-image-300x225.png)
+![ImgPlaceholder](img/placeholder-image-300x225.png)
 
 \newpage
 

diff --git a/src/OSCP-exam-report-template_OS_v2.md b/src/OSCP-exam-report-template_OS_v2.md
@@ -190,7 +190,7 @@ print "\nDone."
 
 Screenshot Here:
 
-![ImgPlaceholder](src/placeholder-image-300x225.png)
+![ImgPlaceholder](img/placeholder-image-300x225.png)
 
 \newpage
 
@@ -217,7 +217,7 @@ SELECT * FROM login WHERE id = 1 or 1=1 AND user LIKE "%root%"
 
 Screenshot Here:
 
-![ImgPlaceholder](src/placeholder-image-300x225.png)
+![ImgPlaceholder](img/placeholder-image-300x225.png)
 
 ## Sample Report - Maintaining Access
 

diff --git a/src/OSED-exam-report-template_epi_v1.md b/src/OSED-exam-report-template_epi_v1.md
@@ -54,7 +54,7 @@ A brief description of the assignments that were solved, including the overall e
 
 Provide a screenshot of running `type proof.txt` and the `ipconfig` command from the directory where proof.txt is stored.
 
-![local.txt](src/placeholder-image-300x225.png)
+![local.txt](img/placeholder-image-300x225.png)
 
 ### Initial Analysis
 
@@ -145,7 +145,7 @@ print('[+] Exploit sent, awaiting shell')
 
 Provide a screenshot of running `type proof.txt` and the `ipconfig` command from the directory where proof.txt is stored.
 
-![local.txt](src/placeholder-image-300x225.png)
+![local.txt](img/placeholder-image-300x225.png)
 
 ### Initial Analysis
 
@@ -236,7 +236,7 @@ print('[+] Exploit sent, awaiting shell')
 
 Provide a screenshot of running `type proof.txt` and the `ipconfig` command from the directory where proof.txt is stored.
 
-![local.txt](src/placeholder-image-300x225.png)
+![local.txt](img/placeholder-image-300x225.png)
 
 ### Initial Analysis
 

diff --git a/src/OSEE-exam-report-template_OS_v1.md b/src/OSEE-exam-report-template_OS_v1.md
@@ -42,7 +42,7 @@ Provide the final proof of concept code used to gain access to the server.
 
 Provide a screenshot of the ipconfig command and the contents of proof.txt.
 
-![ImgPlaceholder](src/placeholder-image-300x225.png)
+![ImgPlaceholder](img/placeholder-image-300x225.png)
 
 ## Steps
 
@@ -66,7 +66,7 @@ Provide the final proof of concept code used to elevate privileges on the target
 
 Provide a screenshot of the id command and the contents of proof.txt.
 
-![ImgPlaceholder](src/placeholder-image-300x225.png)
+![ImgPlaceholder](img/placeholder-image-300x225.png)
 
 ## Steps
 

diff --git a/src/OSEP-exam-report-template_ceso_v1.md b/src/OSEP-exam-report-template_ceso_v1.md
@@ -95,7 +95,7 @@ Provide relevant techniques and methods used to perform enumeration prior to ini
 
 Provide a description of exploitation steps to compromise the machine and obtain shell access, the steps taken should be able to be easily followed and reproducible if necessary. Only the steps that ended up working are required. Include any reference to public tools, if custom code then reference it in the Appendix, for example "Code for AMSI Bypass in Appendix 4.1".
 
-\ ![meterpreter reverse shell and flags](src/placeholder-image-300x225.png){ width=70% }
+\ ![meterpreter reverse shell and flags](img/placeholder-image-300x225.png){ width=70% }
 
 #### Post-Exploitation Enumeration Steps
 
@@ -105,7 +105,7 @@ Provide relevant post-exploitation enumeration steps related to the network or l
 
 Provide a description of exploitation steps to escalate privileges on the machine if applicable, the steps taken should be able to be easily followed and reproducible if necessary. Include any reference to public tools, if custom code then reference it in the Appendix, for example "Code for AMSI Bypass in Appendix 4.1".
 
-\ ![meterpreter reverse shell and flags](src/placeholder-image-300x225.png){ width=70% }
+\ ![meterpreter reverse shell and flags](img/placeholder-image-300x225.png){ width=70% }
 
 ### 192.168.X.X / HOSTNAME - High Priv. User's
 
@@ -131,7 +131,7 @@ Provide relevant techniques and methods used to perform enumeration prior to ini
 
 Provide a description of exploitation steps to compromise the machine and obtain shell access, the steps taken should be able to be easily followed and reproducible if necessary. Only the steps that ended up working are required. Include any reference to public tools, if custom code then reference it in the Appendix, for example "Code for AMSI Bypass in Appendix 4.1".
 
-\ ![meterpreter reverse shell and flags](src/placeholder-image-300x225.png){ width=70% }
+\ ![meterpreter reverse shell and flags](img/placeholder-image-300x225.png){ width=70% }
 
 #### Post-Exploitation Enumeration Steps
 

diff --git a/src/OSWE-exam-report-template_OS_v1.md b/src/OSWE-exam-report-template_OS_v1.md
@@ -56,7 +56,7 @@ Provide the final proof of concept code used to gain access to the server.
 
 Provide a screenshot `id` or `whoami` command and the contents of proof.txt.
 
-![ImgPlaceholder](src/placeholder-image-300x225.png)
+![ImgPlaceholder](img/placeholder-image-300x225.png)
 
 ## Steps
 

diff --git a/src/OSWE-exam-report-template_noraj_v1.md b/src/OSWE-exam-report-template_noraj_v1.md
@@ -75,13 +75,13 @@ Provide screenshots of Burp and your browser showing a successful login as the a
 
 local.txt: `xxx`
 
-![local.txt](src/placeholder-image-300x225.png)
+![local.txt](img/placeholder-image-300x225.png)
 
 Provide a screenshot `id` and `ip a` command and the contents of proof.txt.
 
 proof.txt: `xxx`
 
-![proof.txt](src/placeholder-image-300x225.png)
+![proof.txt](img/placeholder-image-300x225.png)
 
 ### Debug setup
 
@@ -128,13 +128,13 @@ Provide screenshots of Burp and your browser showing a successful login as the a
 
 local.txt: `xxx`
 
-![local.txt](src/placeholder-image-300x225.png)
+![local.txt](img/placeholder-image-300x225.png)
 
 Provide a screenshot `id` and `ip a` command and the contents of proof.txt.
 
 proof.txt: `xxx`
 
-![proof.txt](src/placeholder-image-300x225.png)
+![proof.txt](img/placeholder-image-300x225.png)
 
 ### Debug setup
 

diff --git a/src/OSWE-exam-report-template_xl-sec_v1.md b/src/OSWE-exam-report-template_xl-sec_v1.md
@@ -112,9 +112,9 @@ successful exploitation;
 **`local.txt`** - `MakeSureToEndLineWithTwoSpaces`  
 **`proof.txt`** - `OrElseItWillEndUpOnOneLine`  
 
-![local.txt](src/placeholder-image-300x225.png)
+![local.txt](img/placeholder-image-300x225.png)
 
-![proof.txt](src/placeholder-image-300x225.png){ width=250px }
+![proof.txt](img/placeholder-image-300x225.png){ width=250px }
 
 ### Vuln
 
@@ -179,9 +179,9 @@ successful exploitation;
 **`local.txt`** - `MakeSureToEndLineWithTwoSpaces`  
 **`proof.txt`** - `OrElseItWillEndUpOnOneLine`  
 
-![local.txt](src/placeholder-image-300x225.png)
+![local.txt](img/placeholder-image-300x225.png)
 
-![proof.txt](src/placeholder-image-300x225.png){ width=250px }
+![proof.txt](img/placeholder-image-300x225.png){ width=250px }
 
 ### Vuln
 
@@ -246,9 +246,9 @@ successful exploitation;
 **`local.txt`** - `MakeSureToEndLineWithTwoSpaces`  
 **`proof.txt`** - `OrElseItWillEndUpOnOneLine`  
 
-![local.txt](src/placeholder-image-300x225.png)
+![local.txt](img/placeholder-image-300x225.png)
 
-![proof.txt](src/placeholder-image-300x225.png){ width=250px }
+![proof.txt](img/placeholder-image-300x225.png){ width=250px }
 
 ### Vuln
 

diff --git a/src/OSWP-exam-report-template_OS_v1.md b/src/OSWP-exam-report-template_OS_v1.md
@@ -34,7 +34,7 @@ Provide the contents of the "STAGE 1" wireless network key.
 
 Provide at least one screenshot of the successfully cracked "STAGE 1" wireless network key.
 
-![ImgPlaceholder](src/placeholder-image-300x225.png)
+![ImgPlaceholder](img/placeholder-image-300x225.png)
 
 ## Steps
 
@@ -50,7 +50,7 @@ Provide the contents of the "STAGE 2" wireless network key.
 
 Provide at least one screenshot of the successfully cracked "STAGE 2" wireless network key.
 
-![ImgPlaceholder](src/placeholder-image-300x225.png)
+![ImgPlaceholder](img/placeholder-image-300x225.png)
 
 ## Steps
 
@@ -66,7 +66,7 @@ Provide the contents of the "STAGE 3" wireless network key.
 
 Provide at least one screenshot of the successfully cracked "STAGE 3" wireless network key.
 
-![ImgPlaceholder](src/placeholder-image-300x225.png)
+![ImgPlaceholder](img/placeholder-image-300x225.png)
 
 ## Steps
 

diff --git a/src/placeholder-image-300x225.png → src/img/placeholder-image-300x225.png b/src/placeholder-image-300x225.png → src/img/placeholder-image-300x225.png