From 0f03352587879265ac10a520499c412ccd09b83d Mon Sep 17 00:00:00 2001 From: Kaj Forney Date: Tue, 23 Oct 2018 14:41:03 -0600 Subject: [PATCH] Skel changes. Former-commit-id: 1743e410a6e101150b69d83820ad5977959521f4 Former-commit-id: f20b3f34f1b1556937c55afcc0234a65624f53c9 --- config/pentest-distro-builder.chroot | 2 +- filesystem/etc/skel/.bashrc | 8 ++ filesystem/etc/skel/scripts/cart-k.sh | 138 ---------------------- filesystem/etc/skel/scripts/pingsweepb.sh | 15 --- filesystem/root/.bashrc | 112 ------------------ filesystem/root/.gitignore | 4 + 6 files changed, 13 insertions(+), 266 deletions(-) delete mode 100755 filesystem/etc/skel/scripts/cart-k.sh delete mode 100755 filesystem/etc/skel/scripts/pingsweepb.sh delete mode 100755 filesystem/root/.bashrc create mode 100644 filesystem/root/.gitignore diff --git a/config/pentest-distro-builder.chroot b/config/pentest-distro-builder.chroot index c94560a9..8d767af5 100644 --- a/config/pentest-distro-builder.chroot +++ b/config/pentest-distro-builder.chroot @@ -1,7 +1,7 @@ #!/bin/sh #Populate root's home folder from /etc/skel -cp -r /etc/skel/* /root/ +cp -rv /etc/skel/* /root/ #Time to git stuff... cd /root/ diff --git a/filesystem/etc/skel/.bashrc b/filesystem/etc/skel/.bashrc index 357a4f07..3237a24b 100755 --- a/filesystem/etc/skel/.bashrc +++ b/filesystem/etc/skel/.bashrc @@ -110,3 +110,11 @@ if ! shopt -oq posix; then fi alias reboot='reboot -h now' +export PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games:/usr/share/games:/usr/local/sbin:/usr/sbin:/sbin:~/local/bin + +# check if local bin folder exist +# $HOME/bin +# prepend it to $PATH if so +if [ -d $HOME/bin ]; then + export PATH=$HOME/bin:$PATH +fi diff --git a/filesystem/etc/skel/scripts/cart-k.sh b/filesystem/etc/skel/scripts/cart-k.sh deleted file mode 100755 index e54343ad..00000000 --- a/filesystem/etc/skel/scripts/cart-k.sh +++ /dev/null @@ -1,138 +0,0 @@ -#!/bin/bash - -#Written by Terminal Prophet -#Not for enterprise use - -#CHANGELOG -#2/8/18: Tested sleep .1, worked but took ~2h. Taking it down to .025, should take > 30m -#2/8/18: Added start/end timestamps for testing/debugging -#2/8/18: Changed file creation to a variable, for easier nbtscan integration -#2/8/18: NBTScan integration, using variables in functions -#2/9/18: Sleep .025 works -#2/9/18: Added ASCII art logo and branding - - -#user=$(whoami) -#echo "$user" -mkdir /root/Documents/cartographer_results -function pause(){ - read -p "$*" -} - -function psweep3(){ -#echo "Enter 1st, 2nd, 3rd octets seperated by a space (ex: 192 168 1)" -read oct1 oct2 oct3 -printf 'Start = %(%H:%M:%S)T' -echo -echo -for ip in $(seq 1 254); do -ping -c 1 $oct1.$oct2.$oct3.$ip |grep "bytes from" |cut -d" " -f4|cut -d";" -f1& -sleep .025 -done -echo -printf 'End = %(%H:%M:%S)T' -echo -echo -} - -function psweep2(){ -#echo "Enter 1st, 2nd octets seperated by a space (ex: 192 168)" -read oct1 oct2 -printf 'Start = %(%H:%M:%S)T' -echo -echo -for ip3 in $(seq 0 255); do - for ip4 in $(seq 1 254); do - ping -c 1 $oct1.$oct2.$ip3.$ip4 |grep "bytes from" |cut -d" " -f4|cut -d";" -f1& - sleep .025 - done -done -echo -printf 'End = %(%H:%M:%S)T' -echo -echo -} - - -function psweep1(){ -#echo "Enter 1st octet" -read oct1 -printf 'Start = %(%H:%M:%S)T' -echo -echo -for ip2 in $(seq 0 255); do - for ip3 in $(seq 0 255); do - for ip4 in $(seq 1 254); do - ping -c 1 $oct1.$ip2.$ip3.$ip4 |grep "bytes from" |cut -d" " -f4|cut -d";" -f1& - sleep .025 - done - done -done -echo -printf 'End = %(%H:%M:%S)T' -echo -echo -} - -clear -echo " ______ __ __ " -echo " / ____/___ ______/ /_____ ____ __________ ____ / /_ ___ _____ " -echo " / / / __ / ___/ __/ __ \/ _ / ___/ __ / __ \/ __ \/ _ \/ ___/ " -echo "/ /___/ /_/ / / / /_/ /_/ / /_/ / / / /_/ / /_/ / / / / __/ / " -echo "\____/\__,_/_/ \__/\____/\__, /_/ \__,_/ .___/_/ /_/\___/_/ " -echo " /____/ /_/ " -echo " By: TerminalProphet " -echo " Kali Edition " -echo " " -echo " Active host discovery made easy " -echo " " -echo " " -echo " " -echo "Please select number of octets to set:" -PS3='>>>' -options=("1 octet (not recommended)" "2 octets (about 30min)" "3 octets (about 30sec)" "Quit") -select opt in "${options[@]}" -do - case $opt in - - "1 octet (not recommended)") - #oneoct - echo "Enter 1st octet" -text1="/root/Documents/cartographer_results/ClassA_$(date +%Y%m%d_%H-%M-%S)" - psweep1 > $text1.txt - /usr/bin/nbtscan $oct1.0.0.0/8 >> $text1.txt - echo "Results have been stored at $text1" - pause 'Press any key to continue...' - clear - ;; - - - "2 octets (about 30min)") - #twooct - echo "Enter 1st and 2nd octets seperated by a space (ex: 192 168)" -text2="/root/Documents/cartographer_results/ClassB_$(date +%Y%m%d_%H-%M-%S)" - psweep2 > $text2.txt - /usr/bin/nbtscan $oct1.$oct2.0.0/16 >> $text2.txt - echo "Results have been stored at $text2" - pause 'Press any key to continue...' - clear - ;; - - - "3 octets (about 30sec)") - #threeoct - echo "Enter 1st, 2nd, 3rd octets seperated by a space (ex: 192 168 1)" -text3="/root/Documents/cartographer_results/ClassC_$(date +%Y%m%d_%H-%M)" - psweep3 > $text3.txt - /usr/bin/nbtscan $oct1.$oct2.$oct3.0/24 >> $text3.txt - echo "Results have been stored at $text3" - pause 'Press any key to continue...' - clear - ;; - "Quit") - clear - break - ;; - *) echo invalid option;; - esac -done diff --git a/filesystem/etc/skel/scripts/pingsweepb.sh b/filesystem/etc/skel/scripts/pingsweepb.sh deleted file mode 100755 index ebe837fa..00000000 --- a/filesystem/etc/skel/scripts/pingsweepb.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -#----Zero the counter -counter=0 -#----Start the loop for the 4th octect. Must start at 1 since 0 would be broadcast -for ip4 in $(seq 1 254); do -#----Start the loop for the 3rd octect. This sould start form 0 - for ip3 in $(seq 0 254); do -#----Ping 1 time, look for bytes from to indicate sucessful ping -#----Echo the 4th field form the response which is the ip address -ping -c 1 10.1.$ip3.$ip4 |grep "bytes from" |cut -d" " -f4|cut -d";" -f1& -#echo 10.1.$ip3.$ip4 -counter=$((counter+1)) - done -done -echo $counter diff --git a/filesystem/root/.bashrc b/filesystem/root/.bashrc deleted file mode 100755 index 357a4f07..00000000 --- a/filesystem/root/.bashrc +++ /dev/null @@ -1,112 +0,0 @@ -# ~/.bashrc: executed by bash(1) for non-login shells. -# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc) -# for examples - -# If not running interactively, don't do anything -case $- in - *i*) ;; - *) return;; -esac - -# don't put duplicate lines or lines starting with space in the history. -# See bash(1) for more options -HISTCONTROL=ignoreboth - -# append to the history file, don't overwrite it -shopt -s histappend - -# for setting history length see HISTSIZE and HISTFILESIZE in bash(1) -HISTSIZE=1000 -HISTFILESIZE=2000 - -# check the window size after each command and, if necessary, -# update the values of LINES and COLUMNS. -shopt -s checkwinsize - -# If set, the pattern "**" used in a pathname expansion context will -# match all files and zero or more directories and subdirectories. -#shopt -s globstar - -# make less more friendly for non-text input files, see lesspipe(1) -#[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)" - -# set variable identifying the chroot you work in (used in the prompt below) -if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then - debian_chroot=$(cat /etc/debian_chroot) -fi - -# set a fancy prompt (non-color, unless we know we "want" color) -case "$TERM" in - xterm-color) color_prompt=yes;; -esac - -# uncomment for a colored prompt, if the terminal has the capability; turned -# off by default to not distract the user: the focus in a terminal window -# should be on the output of commands, not on the prompt -force_color_prompt=yes - -if [ -n "$force_color_prompt" ]; then - if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then - # We have color support; assume it's compliant with Ecma-48 - # (ISO/IEC-6429). (Lack of such support is extremely rare, and such - # a case would tend to support setf rather than setaf.) - color_prompt=yes - else - color_prompt= - fi -fi - -if [ "$color_prompt" = yes ]; then - PS1='${debian_chroot:+($debian_chroot)}\[\033[01;31m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ ' -else - PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ ' -fi -unset color_prompt force_color_prompt - -# If this is an xterm set the title to user@host:dir -case "$TERM" in -xterm*|rxvt*) - PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1" - ;; -*) - ;; -esac - -# enable color support of ls and also add handy aliases -if [ -x /usr/bin/dircolors ]; then - test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)" - alias ls='ls --color=auto' - #alias dir='dir --color=auto' - #alias vdir='vdir --color=auto' - - #alias grep='grep --color=auto' - #alias fgrep='fgrep --color=auto' - #alias egrep='egrep --color=auto' -fi - -# some more ls aliases -#alias ll='ls -l' -#alias la='ls -A' -#alias l='ls -CF' - -# Alias definitions. -# You may want to put all your additions into a separate file like -# ~/.bash_aliases, instead of adding them here directly. -# See /usr/share/doc/bash-doc/examples in the bash-doc package. - -if [ -f ~/.bash_aliases ]; then - . ~/.bash_aliases -fi - -# enable programmable completion features (you don't need to enable -# this, if it's already enabled in /etc/bash.bashrc and /etc/profile -# sources /etc/bash.bashrc). -if ! shopt -oq posix; then - if [ -f /usr/share/bash-completion/bash_completion ]; then - . /usr/share/bash-completion/bash_completion - elif [ -f /etc/bash_completion ]; then - . /etc/bash_completion - fi -fi -alias reboot='reboot -h now' - diff --git a/filesystem/root/.gitignore b/filesystem/root/.gitignore new file mode 100644 index 00000000..5e7d2734 --- /dev/null +++ b/filesystem/root/.gitignore @@ -0,0 +1,4 @@ +# Ignore everything in this directory +* +# Except this file +!.gitignore