From bb9be56dd6d2766e81797042d491c75aa121a3e0 Mon Sep 17 00:00:00 2001
From: DMaroo <dhruvmaru007@gmail.com>
Date: Wed, 4 Aug 2021 21:30:52 +0530
Subject: Updated the afl-plot shell script to use GTK UI

TODO: Currently the script is very huge, and needs to be made more
concise and clean. In it's current state, it is hard to maintain.
---
 afl-plot | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 119 insertions(+), 2 deletions(-)

(limited to 'afl-plot')

diff --git a/afl-plot b/afl-plot
index 662c0907..094b35c7 100755
--- a/afl-plot
+++ b/afl-plot
@@ -102,11 +102,21 @@ fi
 rm -f "$outputdir/high_freq.png" "$outputdir/low_freq.png" "$outputdir/exec_speed.png" "$outputdir/edges.png"
 mv -f "$outputdir/index.html" "$outputdir/index.html.orig" 2>/dev/null
 
+mkdir -p "$outputdir/tmp"
+/usr/local/bin/afl-plot-ui > "$outputdir/tmp/win_ids" &
+
+sleep 1
+
+W_ID1=$(cat $outputdir/tmp/win_ids | head -1)
+W_ID2=$(cat $outputdir/tmp/win_ids | head -2 | tail -1)
+W_ID3=$(cat $outputdir/tmp/win_ids | head -3 | tail -1)
+W_ID4=$(cat $outputdir/tmp/win_ids | tail -1)
+
 echo "[*] Generating plots..."
 
 (
 
-cat <<_EOF_
+cat << _EOF_
 set terminal png truecolor enhanced size 1000,300 butt
 
 set output '$outputdir/high_freq.png'
@@ -135,6 +145,37 @@ plot '$inputdir/plot_data' using 1:4 with filledcurve x1 title 'total paths' lin
      '' using 1:6 with lines title 'pending favs' linecolor rgb '#c00080' linewidth 3, \\
      '' using 1:2 with lines title 'cycles done' linecolor rgb '#c000f0' linewidth 3
 
+set term x11 window "$W_ID3"
+set output
+replot
+
+pause mouse close
+
+_EOF_
+
+) | gnuplot &
+
+(
+
+cat << _EOF_
+#set xdata time
+#set timefmt '%s'
+#set format x "%b %d\n%H:%M"
+set tics font 'small'
+unset mxtics
+unset mytics
+
+set grid xtics linetype 0 linecolor rgb '#e0e0e0'
+set grid ytics linetype 0 linecolor rgb '#e0e0e0'
+set border linecolor rgb '#50c0f0'
+set tics textcolor rgb '#000000'
+set key outside
+
+set autoscale xfixmin
+set autoscale xfixmax
+
+set xlabel "relative time in seconds" font "small"
+
 set terminal png truecolor enhanced size 1000,200 butt
 set output '$outputdir/low_freq.png'
 
@@ -143,20 +184,90 @@ plot '$inputdir/plot_data' using 1:8 with filledcurve x1 title '' linecolor rgb
      '' using 1:9 with lines title 'uniq hangs' linecolor rgb '#c000f0' linewidth 3, \\
      '' using 1:10 with lines title 'levels' linecolor rgb '#0090ff' linewidth 3
 
+set term x11 window "$W_ID4"
+set output
+replot
+
+pause mouse close
+
+_EOF_
+
+) | gnuplot &
+
+(
+
+cat << _EOF_
+#set xdata time
+#set timefmt '%s'
+#set format x "%b %d\n%H:%M"
+set tics font 'small'
+unset mxtics
+unset mytics
+
+set grid xtics linetype 0 linecolor rgb '#e0e0e0'
+set grid ytics linetype 0 linecolor rgb '#e0e0e0'
+set border linecolor rgb '#50c0f0'
+set tics textcolor rgb '#000000'
+set key outside
+
+set autoscale xfixmin
+set autoscale xfixmax
+
+set xlabel "relative time in seconds" font "small"
+
 set terminal png truecolor enhanced size 1000,200 butt
 set output '$outputdir/exec_speed.png'
 
 plot '$inputdir/plot_data' using 1:11 with filledcurve x1 title '' linecolor rgb '#0090ff' fillstyle transparent solid 0.2 noborder, \\
      '$inputdir/plot_data' using 1:11 with lines title '    execs/sec' linecolor rgb '#0090ff' linewidth 3 smooth bezier;
 
+set term x11 window "$W_ID2"
+set output
+replot
+
+pause mouse close
+
+_EOF_
+
+) | gnuplot &
+
+(
+
+cat << _EOF_
+#set xdata time
+#set timefmt '%s'
+#set format x "%b %d\n%H:%M"
+set tics font 'small'
+unset mxtics
+unset mytics
+
+set grid xtics linetype 0 linecolor rgb '#e0e0e0'
+set grid ytics linetype 0 linecolor rgb '#e0e0e0'
+set border linecolor rgb '#50c0f0'
+set tics textcolor rgb '#000000'
+set key outside
+
+set autoscale xfixmin
+set autoscale xfixmax
+
+set xlabel "relative time in seconds" font "small"
+
 set terminal png truecolor enhanced size 1000,300 butt
 set output '$outputdir/edges.png'
 
 plot '$inputdir/plot_data' using 1:13 with lines title '        edges' linecolor rgb '#0090ff' linewidth 3
 
+set term x11 window "$W_ID1"
+set output
+replot
+
+pause mouse close
+
 _EOF_
 
-) | gnuplot 
+) | gnuplot &
+
+sleep 2
 
 if [ ! -s "$outputdir/exec_speed.png" ]; then
 
@@ -188,6 +299,12 @@ _EOF_
 chmod 755 "$outputdir"
 chmod 644 "$outputdir/high_freq.png" "$outputdir/low_freq.png" "$outputdir/exec_speed.png" "$outputdir/edges.png" "$outputdir/index.html"
 
+rm "$outputdir/tmp/win_ids"
+
+if [ -z "$(ls -A $outputdir/tmp)" ]; then
+	rm -r "$outputdir/tmp"
+fi
+
 echo "[+] All done - enjoy your charts!"
 
 exit 0
-- 
cgit 1.4.1


From fa7e3453d3e5e60907f93af23c7c5e5441d0d5eb Mon Sep 17 00:00:00 2001
From: DMaroo <dhruvmaru007@gmail.com>
Date: Fri, 6 Aug 2021 18:43:43 +0530
Subject: Added support for graphical command line flag, improved the general
 organization of script

Script works as "intended"
---
 afl-plot | 220 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 116 insertions(+), 104 deletions(-)

(limited to 'afl-plot')

diff --git a/afl-plot b/afl-plot
index 094b35c7..52cec521 100755
--- a/afl-plot
+++ b/afl-plot
@@ -22,16 +22,21 @@ get_abs_path() {
 echo "progress plotting utility for afl-fuzz by Michal Zalewski"
 echo
 
-if [ ! "$#" = "2" ]; then
+if ( [ "$#" != "2" ] && [ "$#" != "3" ] ) || ( [ "$#" = "3" ] && [ "$3" != "-g" ] && [ "$3" != "--graphical" ] ); then
 
   cat 1>&2 <<_EOF_
-$0 afl_state_dir graph_output_dir
+$0 afl_state_dir graph_output_dir [ -g | --graphical ]
 
-This program generates gnuplot images from afl-fuzz output data. Usage:
+This program generates gnuplot images from afl-fuzz output data.
 
-The afl_state_dir parameter should point to an existing state directory for any
-active or stopped instance of afl-fuzz; while graph_output_dir should point to
-an empty directory where this tool can write the resulting plots to.
+Usage:
+
+    afl_state_dir       should point to an existing state directory for any
+                        active or stopped instance of afl-fuzz
+    graph_output_dir    should point to an empty directory where this
+                        tool can write the resulting plots to
+    -g, --graphical     (optional) display the plots in a graphical window
+                        (requires GTK as a dependency)
 
 The program will put index.html and three PNG images in the output directory;
 you should be able to view it with any web browser of your choice.
@@ -102,28 +107,10 @@ fi
 rm -f "$outputdir/high_freq.png" "$outputdir/low_freq.png" "$outputdir/exec_speed.png" "$outputdir/edges.png"
 mv -f "$outputdir/index.html" "$outputdir/index.html.orig" 2>/dev/null
 
-mkdir -p "$outputdir/tmp"
-/usr/local/bin/afl-plot-ui > "$outputdir/tmp/win_ids" &
-
-sleep 1
-
-W_ID1=$(cat $outputdir/tmp/win_ids | head -1)
-W_ID2=$(cat $outputdir/tmp/win_ids | head -2 | tail -1)
-W_ID3=$(cat $outputdir/tmp/win_ids | head -3 | tail -1)
-W_ID4=$(cat $outputdir/tmp/win_ids | tail -1)
-
-echo "[*] Generating plots..."
-
-(
-
-cat << _EOF_
-set terminal png truecolor enhanced size 1000,300 butt
-
-set output '$outputdir/high_freq.png'
-
+GNUPLOT_SETUP="
 #set xdata time
 #set timefmt '%s'
-#set format x "%b %d\n%H:%M"
+#set format x \"%b %d\n%H:%M\"
 set tics font 'small'
 unset mxtics
 unset mytics
@@ -137,94 +124,105 @@ set key outside
 set autoscale xfixmin
 set autoscale xfixmax
 
-set xlabel "relative time in seconds" font "small"
+set xlabel \"relative time in seconds\" font \"small\"
+"
+
+PLOT_HF="
+set terminal png truecolor enhanced size 1000,300 butt
+set output '$outputdir/high_freq.png'
+
+$GNUPLOT_SETUP
 
 plot '$inputdir/plot_data' using 1:4 with filledcurve x1 title 'total paths' linecolor rgb '#000000' fillstyle transparent solid 0.2 noborder, \\
      '' using 1:3 with filledcurve x1 title 'current path' linecolor rgb '#f0f0f0' fillstyle transparent solid 0.5 noborder, \\
      '' using 1:5 with lines title 'pending paths' linecolor rgb '#0090ff' linewidth 3, \\
      '' using 1:6 with lines title 'pending favs' linecolor rgb '#c00080' linewidth 3, \\
      '' using 1:2 with lines title 'cycles done' linecolor rgb '#c000f0' linewidth 3
+"
 
-set term x11 window "$W_ID3"
-set output
-replot
+PLOT_LF="
+set terminal png truecolor enhanced size 1000,200 butt
+set output '$outputdir/low_freq.png'
 
-pause mouse close
+$GNUPLOT_SETUP
 
-_EOF_
+plot '$inputdir/plot_data' using 1:8 with filledcurve x1 title '' linecolor rgb '#c00080' fillstyle transparent solid 0.2 noborder, \\
+     '' using 1:8 with lines title ' uniq crashes' linecolor rgb '#c00080' linewidth 3, \\
+     '' using 1:9 with lines title 'uniq hangs' linecolor rgb '#c000f0' linewidth 3, \\
+     '' using 1:10 with lines title 'levels' linecolor rgb '#0090ff' linewidth 3
+"
 
-) | gnuplot &
+PLOT_ES="
+set terminal png truecolor enhanced size 1000,200 butt
+set output '$outputdir/exec_speed.png'
 
-(
+$GNUPLOT_SETUP
 
-cat << _EOF_
-#set xdata time
-#set timefmt '%s'
-#set format x "%b %d\n%H:%M"
-set tics font 'small'
-unset mxtics
-unset mytics
+plot '$inputdir/plot_data' using 1:11 with filledcurve x1 title '' linecolor rgb '#0090ff' fillstyle transparent solid 0.2 noborder, \\
+     '$inputdir/plot_data' using 1:11 with lines title '    execs/sec' linecolor rgb '#0090ff' linewidth 3 smooth bezier;
+"
 
-set grid xtics linetype 0 linecolor rgb '#e0e0e0'
-set grid ytics linetype 0 linecolor rgb '#e0e0e0'
-set border linecolor rgb '#50c0f0'
-set tics textcolor rgb '#000000'
-set key outside
+PLOT_EG="
+set terminal png truecolor enhanced size 1000,300 butt
+set output '$outputdir/edges.png'
 
-set autoscale xfixmin
-set autoscale xfixmax
+$GNUPLOT_SETUP
 
-set xlabel "relative time in seconds" font "small"
+plot '$inputdir/plot_data' using 1:13 with lines title '        edges' linecolor rgb '#0090ff' linewidth 3
+"
 
-set terminal png truecolor enhanced size 1000,200 butt
-set output '$outputdir/low_freq.png'
 
-plot '$inputdir/plot_data' using 1:8 with filledcurve x1 title '' linecolor rgb '#c00080' fillstyle transparent solid 0.2 noborder, \\
-     '' using 1:8 with lines title ' uniq crashes' linecolor rgb '#c00080' linewidth 3, \\
-     '' using 1:9 with lines title 'uniq hangs' linecolor rgb '#c000f0' linewidth 3, \\
-     '' using 1:10 with lines title 'levels' linecolor rgb '#0090ff' linewidth 3
+if [ "$#" = "3" ] && ( [ "$3" = "-g" ] || [ "$3" = "--graphical" ] ); then
 
-set term x11 window "$W_ID4"
-set output
-replot
+afl-plot-ui -h > /dev/null 2>&1
 
-pause mouse close
+if [ "$?" != "0" ]; then
 
+cat 1>&2 <<_EOF_
+You do not seem to have the afl-plot-ui utility installed. If you have installed afl-plot-ui, make sure the afl-plot-ui executable is in your PATH.
+If you are still facing any problems, please open an issue at https://github.com/AFLplusplus/AFLplusplus/issues.
+
+No plots have been generated. Please rerun without the "-g" or "--graphical" flag to generate the plots.
 _EOF_
 
-) | gnuplot &
+exit 1
+
+fi
+
+mkdir -p "$outputdir/tmp"
+afl-plot-ui > "$outputdir/tmp/win_ids" &
+
+sleep 2
+
+W_ID1=$(cat $outputdir/tmp/win_ids | head -1)
+W_ID2=$(cat $outputdir/tmp/win_ids | head -2 | tail -1)
+W_ID3=$(cat $outputdir/tmp/win_ids | head -3 | tail -1)
+W_ID4=$(cat $outputdir/tmp/win_ids | tail -1)
+
+echo "[*] Generating plots..."
 
 (
 
 cat << _EOF_
-#set xdata time
-#set timefmt '%s'
-#set format x "%b %d\n%H:%M"
-set tics font 'small'
-unset mxtics
-unset mytics
 
-set grid xtics linetype 0 linecolor rgb '#e0e0e0'
-set grid ytics linetype 0 linecolor rgb '#e0e0e0'
-set border linecolor rgb '#50c0f0'
-set tics textcolor rgb '#000000'
-set key outside
+$PLOT_HF
+set term x11 window "$W_ID3"
+set output
+replot
+pause mouse close
 
-set autoscale xfixmin
-set autoscale xfixmax
+_EOF_
 
-set xlabel "relative time in seconds" font "small"
+) | gnuplot &
 
-set terminal png truecolor enhanced size 1000,200 butt
-set output '$outputdir/exec_speed.png'
+(
 
-plot '$inputdir/plot_data' using 1:11 with filledcurve x1 title '' linecolor rgb '#0090ff' fillstyle transparent solid 0.2 noborder, \\
-     '$inputdir/plot_data' using 1:11 with lines title '    execs/sec' linecolor rgb '#0090ff' linewidth 3 smooth bezier;
+cat << _EOF_
 
-set term x11 window "$W_ID2"
+$PLOT_LF
+set term x11 window "$W_ID4"
 set output
 replot
-
 pause mouse close
 
 _EOF_
@@ -234,33 +232,25 @@ _EOF_
 (
 
 cat << _EOF_
-#set xdata time
-#set timefmt '%s'
-#set format x "%b %d\n%H:%M"
-set tics font 'small'
-unset mxtics
-unset mytics
 
-set grid xtics linetype 0 linecolor rgb '#e0e0e0'
-set grid ytics linetype 0 linecolor rgb '#e0e0e0'
-set border linecolor rgb '#50c0f0'
-set tics textcolor rgb '#000000'
-set key outside
+$PLOT_ES
+set term x11 window "$W_ID2"
+set output
+replot
+pause mouse close
 
-set autoscale xfixmin
-set autoscale xfixmax
+_EOF_
 
-set xlabel "relative time in seconds" font "small"
+) | gnuplot &
 
-set terminal png truecolor enhanced size 1000,300 butt
-set output '$outputdir/edges.png'
+(
 
-plot '$inputdir/plot_data' using 1:13 with lines title '        edges' linecolor rgb '#0090ff' linewidth 3
+cat << _EOF_
 
+$PLOT_EG
 set term x11 window "$W_ID1"
 set output
 replot
-
 pause mouse close
 
 _EOF_
@@ -269,6 +259,34 @@ _EOF_
 
 sleep 2
 
+rm "$outputdir/tmp/win_ids"
+
+if [ -z "$(ls -A $outputdir/tmp)" ]; then
+	rm -r "$outputdir/tmp"
+fi
+
+else
+
+echo "[*] Generating plots..."
+
+(
+
+cat << _EOF_
+
+$PLOT_HF
+
+$PLOT_LF
+
+$PLOT_ES
+
+$PLOT_EG
+
+_EOF_
+
+) | gnuplot
+
+fi
+
 if [ ! -s "$outputdir/exec_speed.png" ]; then
 
   echo "[-] Error: something went wrong! Perhaps you have an ancient version of gnuplot?" 1>&2
@@ -299,12 +317,6 @@ _EOF_
 chmod 755 "$outputdir"
 chmod 644 "$outputdir/high_freq.png" "$outputdir/low_freq.png" "$outputdir/exec_speed.png" "$outputdir/edges.png" "$outputdir/index.html"
 
-rm "$outputdir/tmp/win_ids"
-
-if [ -z "$(ls -A $outputdir/tmp)" ]; then
-	rm -r "$outputdir/tmp"
-fi
-
 echo "[+] All done - enjoy your charts!"
 
 exit 0
-- 
cgit 1.4.1


From 1095840b98588c51d214cf7920f0e3f6bfaa716b Mon Sep 17 00:00:00 2001
From: DMaroo <dhruvmaru007@gmail.com>
Date: Fri, 6 Aug 2021 21:08:50 +0530
Subject: Changed parameter order, reduced script execution time

---
 afl-plot | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

(limited to 'afl-plot')

diff --git a/afl-plot b/afl-plot
index 52cec521..a06b0c7f 100755
--- a/afl-plot
+++ b/afl-plot
@@ -22,10 +22,17 @@ get_abs_path() {
 echo "progress plotting utility for afl-fuzz by Michal Zalewski"
 echo
 
-if ( [ "$#" != "2" ] && [ "$#" != "3" ] ) || ( [ "$#" = "3" ] && [ "$3" != "-g" ] && [ "$3" != "--graphical" ] ); then
+GRAPHICAL="0"
+
+if [ "$1"  = "-g" ] || [ "$1" = "--graphical" ]; then
+GRAPHICAL="1"
+shift
+fi
+
+if [ "$#" != "2" ]; then
 
   cat 1>&2 <<_EOF_
-$0 afl_state_dir graph_output_dir [ -g | --graphical ]
+$0 [ -g | --graphical ] afl_state_dir graph_output_dir
 
 This program generates gnuplot images from afl-fuzz output data.
 
@@ -36,7 +43,7 @@ Usage:
     graph_output_dir    should point to an empty directory where this
                         tool can write the resulting plots to
     -g, --graphical     (optional) display the plots in a graphical window
-                        (requires GTK as a dependency)
+                        (you should have built afl-plot-ui to use this option)
 
 The program will put index.html and three PNG images in the output directory;
 you should be able to view it with any web browser of your choice.
@@ -171,8 +178,7 @@ $GNUPLOT_SETUP
 plot '$inputdir/plot_data' using 1:13 with lines title '        edges' linecolor rgb '#0090ff' linewidth 3
 "
 
-
-if [ "$#" = "3" ] && ( [ "$3" = "-g" ] || [ "$3" = "--graphical" ] ); then
+if [ "$#" = "2" ] && [ "$GRAPHICAL" = "1" ]; then
 
 afl-plot-ui -h > /dev/null 2>&1
 
@@ -192,7 +198,7 @@ fi
 mkdir -p "$outputdir/tmp"
 afl-plot-ui > "$outputdir/tmp/win_ids" &
 
-sleep 2
+sleep 0.5
 
 W_ID1=$(cat $outputdir/tmp/win_ids | head -1)
 W_ID2=$(cat $outputdir/tmp/win_ids | head -2 | tail -1)
@@ -213,7 +219,7 @@ pause mouse close
 
 _EOF_
 
-) | gnuplot &
+) | gnuplot 2> /dev/null &
 
 (
 
@@ -227,7 +233,7 @@ pause mouse close
 
 _EOF_
 
-) | gnuplot &
+) | gnuplot 2> /dev/null &
 
 (
 
@@ -241,7 +247,7 @@ pause mouse close
 
 _EOF_
 
-) | gnuplot &
+) | gnuplot 2> /dev/null &
 
 (
 
@@ -255,9 +261,9 @@ pause mouse close
 
 _EOF_
 
-) | gnuplot &
+) | gnuplot 2> /dev/null &
 
-sleep 2
+sleep 1
 
 rm "$outputdir/tmp/win_ids"
 
@@ -285,6 +291,8 @@ _EOF_
 
 ) | gnuplot
 
+echo "[?] You can also use -g flag to view the plots in an GUI window, and interact with the plots (if you have build afl-plot-ui). Run \"afl-plot\" to know more."
+
 fi
 
 if [ ! -s "$outputdir/exec_speed.png" ]; then
-- 
cgit 1.4.1


From e7d8272aeda73a6ed7750de36bb97f540401bf3e Mon Sep 17 00:00:00 2001
From: DMaroo <dhruvmaru007@gmail.com>
Date: Fri, 6 Aug 2021 22:13:00 +0530
Subject: Fixed a typo

---
 afl-plot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'afl-plot')

diff --git a/afl-plot b/afl-plot
index a06b0c7f..87b9caae 100755
--- a/afl-plot
+++ b/afl-plot
@@ -291,7 +291,7 @@ _EOF_
 
 ) | gnuplot
 
-echo "[?] You can also use -g flag to view the plots in an GUI window, and interact with the plots (if you have build afl-plot-ui). Run \"afl-plot\" to know more."
+echo "[?] You can also use -g flag to view the plots in an GUI window, and interact with the plots (if you have built afl-plot-ui). Run \"afl-plot-h\" to know more."
 
 fi
 
-- 
cgit 1.4.1