From 620cfdd682d61c47d15c9f1c8e8a379ec0db56e7 Mon Sep 17 00:00:00 2001 From: Olivier Berger Date: Fri, 13 Apr 2018 08:57:31 +0200 Subject: [PATCH 1/7] Add pointer to papers --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5ec737105..1864ad4c9 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,8 @@ Labtainers include more than 35 cyber lab exercises and tools to build your own. * Automated assessment of student lab activity and progress * Individualized lab exercises to discourage sharing solutions -Labtainers provide controlled and consistent execution environments in which students perform labs entirely within the confines of their computer, regardless of the Linux distribution and packages installed on the student's computer. The only requirement is that the Linux system supports Docker. See the Papers below for additional information about the framework. +Labtainers provide controlled and consistent execution environments in which students perform labs entirely within the confines of their computer, regardless of the Linux distribution and packages installed on the student's computer. The only requirement is that the Linux system supports Docker. See the [Papers][Papers] for additional information about the framework. -The Labtainers website, and the downloads are at https://my.nps.edu/web/c3o/labtainers. +The Labtainers website, and the downloads are at . + +[Papers]: https://my.nps.edu/web/c3o/labtainers#papers From ea81915211179ff94eca068ce23ee03910f93e5b Mon Sep 17 00:00:00 2001 From: Olivier Berger Date: Fri, 13 Apr 2018 08:59:45 +0200 Subject: [PATCH 2/7] Typo --- labs/telnetlab/config/about.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/labs/telnetlab/config/about.txt b/labs/telnetlab/config/about.txt index 2d78513be..b158a8ec2 100644 --- a/labs/telnetlab/config/about.txt +++ b/labs/telnetlab/config/about.txt @@ -1 +1 @@ -Illustrates the telent protocol transmission of plain-text passwords. +Illustrates the telnet protocol transmission of plain-text passwords. From 17ce6fe186fbb261f198133f35c8a51eb10083b3 Mon Sep 17 00:00:00 2001 From: Olivier Berger Date: Fri, 13 Apr 2018 10:15:15 +0200 Subject: [PATCH 3/7] Typos --- docs/labdesigner/labdesigner.tex | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/labdesigner/labdesigner.tex b/docs/labdesigner/labdesigner.tex index 76e9950d6..7109b2632 100644 --- a/docs/labdesigner/labdesigner.tex +++ b/docs/labdesigner/labdesigner.tex @@ -153,7 +153,7 @@ The difference between the development kit and the standard Labtainer distribution is primarily just the lab definition files, which are withheld from the general distribution for efficiency. If you have a Labtainer installation, you can get the developer files by going to your -labtainers directory, e.g., {\tt ~/labtainers} and running {\tt ./update-designer.sh} +labtainers directory, e.g., {\tt \~{}/labtainers/} and running {\tt ./update-designer.sh} You may then want to logout and login again, or run a new {\tt bash} shell because that script sets some environment variables. @@ -344,7 +344,7 @@ \subsection{Testing the new lab} \item labtainer.centos -- A CentOS server with systemd and the true ``init'' initial process. \item labtainer.lamp -- A CentOS server with Apache, Mysql and PHP, (the LAMP stack) \item labtainer.firefox -- An Ubuntu container with the Firefox browser. -\item labtainer.wireshark -- The labtaienr.network with wireshark added. +\item labtainer.wireshark -- The labtainer.network with wireshark added. \item labtainer.java -- An Ubuntu container with the Firefox browser and the open JDK. \item labtainer.kali -- A Kali Linux system with the Metasploit framework. \item labtainer.metasploitable -- The Metasploitable-2 vulnerable server. From f2bb0e6d78355b4ffa09f89c622dc6a830908cd5 Mon Sep 17 00:00:00 2001 From: Olivier Berger Date: Fri, 13 Apr 2018 10:15:29 +0200 Subject: [PATCH 4/7] Tiny additions --- docs/student/labtainer-student.tex | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/student/labtainer-student.tex b/docs/student/labtainer-student.tex index 2517b5eff..d16d6e55f 100644 --- a/docs/student/labtainer-student.tex +++ b/docs/student/labtainer-student.tex @@ -27,7 +27,7 @@ \subsection{Obtaining and installing Labtainers} \url{https://my.nps.edu/web/c3o/virtual-machine-images}, you may skip this section. The Labtainer framework is distributed as a tarball from: -\url{https://my.nps.edu/web/cisr/labtainers} +\url{https://my.nps.edu/web/cisr/labtainers}. Click the link named: ``Download the Labtainer framework'', and untar the resulting file into a permanent directory on your Linux system, e.g., into \verb ~/home. For example, if you downloaded the file from a browser on your Linux system: @@ -36,7 +36,7 @@ \subsection{Obtaining and installing Labtainers} tar -xf ~/Downloads/labtainer.tar \end{verbatim} From the directory into which you untarred the -tarball: +tarball, start the installer script: \begin{verbatim} cd labtainer ./install-labtainer.sh From 17186e115383a824f4b1f9b83f4da90ad0e0bd3c Mon Sep 17 00:00:00 2001 From: Olivier Berger Date: Mon, 30 Apr 2018 18:43:20 +0200 Subject: [PATCH 5/7] Make sure that sudo installed and user sudoer --- setup_scripts/install-docker-debian.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/setup_scripts/install-docker-debian.sh b/setup_scripts/install-docker-debian.sh index bc3efdfed..7cedbbcc2 100755 --- a/setup_scripts/install-docker-debian.sh +++ b/setup_scripts/install-docker-debian.sh @@ -11,6 +11,9 @@ END # #Install Docker on a Debian system, along with other packages required by Labtainers # +type sudo >/dev/null 2>&1 || { echo >&2 "Please install sudo. Aborting."; exit 1; } + +sudo -v || { echo >&2 "Please make sure user is sudoer. Aborting."; exit 1; } #needed packages for Docker install sudo apt-get update From bd836ab8750e98e68bbfb2779fd8fc803fc451fc Mon Sep 17 00:00:00 2001 From: Olivier Berger Date: Mon, 30 Apr 2018 18:43:49 +0200 Subject: [PATCH 6/7] Match "Debian GNU/Linux" too --- setup_scripts/install-labtainer.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup_scripts/install-labtainer.sh b/setup_scripts/install-labtainer.sh index e717a5aa8..c18e0d504 100755 --- a/setup_scripts/install-labtainer.sh +++ b/setup_scripts/install-labtainer.sh @@ -36,7 +36,7 @@ case "$distrib" in ./install-docker-ubuntu.sh RESULT=$? ;; - Debian) + Debian|\"Debian*) echo is debian ./install-docker-debian.sh RESULT=$? From 7fdf56ce06d3de6ecbc685d371d507264a0251bd Mon Sep 17 00:00:00 2001 From: Olivier Berger Date: Mon, 30 Apr 2018 18:44:21 +0200 Subject: [PATCH 7/7] Allows executing the scripts more than once Only tries to create the symlinks if they're not yet there --- setup_scripts/install-labtainer.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup_scripts/install-labtainer.sh b/setup_scripts/install-labtainer.sh index c18e0d504..e22c8e5a2 100755 --- a/setup_scripts/install-labtainer.sh +++ b/setup_scripts/install-labtainer.sh @@ -16,8 +16,8 @@ if [[ result -ne 0 ]];then EOT fi -ln -s trunk/scripts/labtainer-student -ln -s trunk/scripts/labtainer-instructor +if [ ! -h labtainer-student ]; then ln -s trunk/scripts/labtainer-student; fi +if [ ! -h labtainer-instructor ]; then ln -s trunk/scripts/labtainer-instructor; fi cd trunk/setup_scripts found_distrib=`cat /etc/*-release | grep "^DISTRIB_ID" | awk -F "=" '{print $2}'` if [[ -z "$1" ]]; then