use csvsimple package to display port/service scans.

4 files changed, 44 insertions, 4 deletions

diff --git a/README.md b/README.md
index 6e3f817..a530b9a 100644
--- a/README.md
+++ b/README.md
@@ -21,10 +21,11 @@
   * used for recon, discovery and mapping phases.
 
 Targets:
-* metasploitable
-* tomcat-apache
-* bwa
-* ultimatelamp
+
+* metasploitable.sait230.ca
+* tomcat-apache.sait230.ca
+* bwa.sait230.ca
+* ultimatelamp.sait230.ca
 
 # web security technologies
 
diff --git a/report/hosts.csv b/report/hosts.csv
new file mode 100644
index 0000000..d71e147
--- /dev/null
+++ b/report/hosts.csv
@@ -0,0 +1,5 @@
+hostname,ip address
+bwa.sait230.ca,10.10.10.1
+metasploitable.sait230.ca,10.10.10.2
+tomcat-apache.sait230.ca,10.10.10.3
+ultimatelamp.sait230.ca,10.10.10.4
diff --git a/report/ports.csv b/report/ports.csv
new file mode 100644
index 0000000..3ce8db2
--- /dev/null
+++ b/report/ports.csv
@@ -0,0 +1,3 @@
+Hostname,PORT,STATE,SERVICE,VERSION
+localhost,2222/tcp,open,ssh,OpenSSH 5.3 (protocol 2.0)
+localhost,3000/tcp,open,tcpwrapped,
diff --git a/report/template.tex b/report/template.tex
index 3b8d36c..963c418 100644
--- a/report/template.tex
+++ b/report/template.tex
@@ -8,6 +8,7 @@
 \usepackage{pgfplots}
 \usepackage{siunitx}
 \usepackage{tikz}
+\usepackage{csvsimple}
 
 \lstset{
   language=Perl,
@@ -75,8 +76,17 @@ Even more text.
 \section{Recon}
 \subsection{Information}
 \subsubsection{DNS}
+
+List out entries found in the /etc/hosts file.
+
 \subsubsection{IP Ranges}
+
+Use genlist to generate a list of ip addresses found.
+
 \subsubsection{Domain names}
+
+\csvautotabular{hosts.csv}
+
 \subsection{Diagrams and spreadsheets}
 \subsection{Tools}
 
@@ -84,6 +94,27 @@ Even more text.
 \section{Mapping}
 \subsection{Open Ports}
 \subsection{Service version}
+
+\csvautotabular{ports.csv}
+
+\noindent The following command :
+\begin{lstlisting}[language=bash]
+$ nmap -sV localhost
+
+Starting Nmap 7.01 ( https://nmap.org ) at 2016-02-08 12:02 MST
+Nmap scan report for localhost (127.0.0.1)
+Host is up (0.00036s latency).
+Other addresses for localhost (not scanned): ::1
+Not shown: 998 closed ports
+PORT     STATE SERVICE    VERSION
+2222/tcp open  ssh        OpenSSH 5.3 (protocol 2.0)
+3000/tcp open  tcpwrapped
+
+Service detection performed. Please report any incorrect results at https://nmap.org/submit/ .
+Nmap done: 1 IP address (1 host up) scanned in 8.78 seconds
+
+\end{lstlisting}
+
 \subsection{Exploits Available}
 
 \newpage