Merge pull request 'Install UFW and Update removed functions in Pillow 10' (#113) from ufw into main

Reviewed-on: pulls/113

Author: vicariousdrama

CHANGELOG.md

@@ -5,6 +5,10 @@ title: NODEYEZ Change Log
 
 ## main
 
+## 23.07
+
+Released: 2023-07-30
+
 **New Panels and Ehancements**
 
 - Blockstats panels for feerates now reports the low value in addition to high and avg
@@ -16,6 +20,9 @@ title: NODEYEZ Change Log
 - Removed Twitter references
 - Added maze.html serverless sample (https://nodeyez.com/maze.html)
 - Reverted Python dependency to support 3.7
+- Installation now gives guidance on setting up UFW and fail2ban instead of assuming it was present. UFW is called upon to enable the website dashboard port for local network access
+- Mitigating partial RaspiBolt setup (Bitcoin installed, but not NGINX)
+- Updates to resolve deprecated and removed functions in Pillow
 
 **Bugfixes**
 

_install_steps/3tools.md

@@ -74,6 +74,32 @@ Provides for network connection calls used by Miner tools
 sudo apt-get install netcat
 ```
 
+## Install Uncomplicated Firewall Rules
+
+This provides for a convenient wrapper around iptables for network rules
+
+```shell
+UFW_PATH=$(which ufw)
+if [ -z "$UFW_PATH" ]; then
+  echo "installing and initializing ufw..."
+  sudo apt-get -y install ufw
+  sudo ufw default deny incoming
+  sudo ufw default allow outgoing
+  sudo ufw allow ssh
+  sudo ufw logging off
+  sudo ufw enable
+fi
+```
+
+## Install Fail2Ban
+
+Prevent brute force login attempts by rejecting for time after too many successive failed logins
+
+```shell
+sudo apt-get -y install fail2ban
+```
+
+
 ---
 
 [Home](../) | [Back to Display Screen]({% link _install_steps/2displayscreen.md %}) | [Continue to Nodeyez]({% link _install_steps/4nodeyez.md %})

index.md

@@ -60,7 +60,7 @@ Optionally attach a [Display Screen]({% link _install_steps/2displayscreen.md %}
 
 Want to contribute and make changes? For guidance on setting up a development environment, start with the [Python and IDE Setup]({% link _developer/1basicsetup.md %}).
 
-[Change Log]({% link CHANGELOG.md %})
+View the [Change Log]({% link CHANGELOG.md %})
 
 You can support me by using the Mash Boost button, or sending me tips via [Strike](https://strike.me/vicariousdrama)
 

install.sh

@@ -138,6 +138,21 @@ apt-get -y install \
     python3-venv \
     zlib1g-dev 
 
+# Install and initialize UFW if not present
+UFW_PATH=$(which ufw)
+if [ -z "$UFW_PATH" ]; then
+  echo "installing and initializing ufw..."
+  apt-get -y install ufw
+  ufw default deny incoming
+  ufw default allow outgoing
+  ufw allow ssh
+  ufw logging off
+  ufw enable
+fi
+
+# Install fail2ban
+apt-get -y install fail2ban
+
 # Create Nodeyez user
 echo "================================================"
 echo "CREATING NODEYEZ USER"
@@ -426,6 +441,19 @@ elif [ $ISRASPIBOLT -gt 0 ]; then
       cp /home/nodeyez/nodeyez/scripts/nginx/https_nodeyez_raspibolt.conf /etc/nginx/streams-enabled/https_nodeyez_raspibolt.conf
       CREATED_WEBSITE=1
     fi
+  else
+    # nginx installed, but not with raspibolt custom config, warn and install generic
+    echo "- based on the Bitcoin service file, this appears to be a RaspiBolt install"
+    echo "  but the Nginx configuration is default using sites-enabled instead of"
+    echo "  streams-enabled.  A generic configuration for Nodeyez dashboard will be"
+    echo "  installed."
+    echo "WARNING: If you proceed with the Raspibolt configuration of NGINX as defined here"
+    echo "  https://raspibolt.org/guide/raspberry-pi/security.html#prepare-nginx-reverse-proxy"
+    echo "you may need to re-run this installation to setup the Nodeyez dashboard"
+    echo "with the streams-enabled setup"
+    echo "- copying Nodeyez site configuration as generic sites-enabled"
+    cp /home/nodeyez/nodeyez/scripts/nginx/https_nodeyez.conf /etc/nginx/sites-enabled/https_nodeyez.conf
+    CREATED_WEBSITE=1
   fi
 else
   # generic site config

scripts/vicarioustext.py

@@ -37,26 +37,36 @@ def getmaxtextforwidth(draw, words, width, fontsize, isbold=False):
 
 def gettextdimensions(draw, s, fontsize, isbold=False):
     thefont = getfont(fontsize, isbold)
-    sw,sh = draw.textsize(s, thefont)
-    return sw,sh,thefont
+    # Deprecated, removed in Pillow 10.0.0
+    #sw,sh = draw.textsize(s, thefont)
+    # New in 8.0.0, required in Pillow 10.0.0
+    left, top, right, bottom = thefont.getbbox(text=s)
+    return right, bottom, thefont
+
+def gettextoffset(thefont,s):
+    # Deprecated, removed in Pillow 10.0.0
+    #ox,oy = thefont.getoffset(s)
+    # New in 8.0.0, required in Pillow 10.0.0
+    left,top,_,_ = thefont.getbbox(text=s)
+    return left, top
 
 def drawcenteredtext(draw, s, fontsize, x, y, textcolor=colorFFFFFF, isbold=False):
     sw,sh,thefont = gettextdimensions(draw, s, fontsize, isbold)
-    ox,oy = thefont.getoffset(s)
+    ox,oy = gettextoffset(thefont,s)
     sw += ox
     sh += oy
     draw.text(xy=(x-(sw/2),y-(sh/2)), text=s, font=thefont, fill=textcolor)
 
 def drawbottomlefttext(draw, s, fontsize, x, y, textcolor=colorFFFFFF, isbold=False):
     sw,sh,thefont = gettextdimensions(draw, s, fontsize, isbold)
-    ox,oy = thefont.getoffset(s)
+    ox,oy = gettextoffset(thefont,s)
     sw += ox
     sh += oy
     draw.text(xy=(x,y-sh), text=s, font=thefont, fill=textcolor)
 
 def drawbottomrighttext(draw, s, fontsize, x, y, textcolor=colorFFFFFF, isbold=False):
     sw,sh,thefont = gettextdimensions(draw, s, fontsize, isbold)
-    ox,oy = thefont.getoffset(s)
+    ox,oy = gettextoffset(thefont,s)
     sw += ox
     sh += oy
     draw.text(xy=(x-sw,y-sh), text=s, font=thefont, fill=textcolor)
@@ -99,28 +109,28 @@ def drawLabel(draw, s="", fontsize=12, anchorposition="tl", anchorx=0, anchory=0
 
 def drawtoplefttext(draw, s, fontsize, x, y, textcolor=colorFFFFFF, isbold=False):
     sw,sh,thefont = gettextdimensions(draw, s, fontsize, isbold)
-    ox,oy = thefont.getoffset(s)
+    ox,oy = gettextoffset(thefont,s)
     sw += ox
     sh += oy
     draw.text(xy=(x,y), text=s, font=thefont, fill=textcolor)
 
 def drawtoprighttext(draw, s, fontsize, x, y, textcolor=colorFFFFFF, isbold=False):
     sw,sh,thefont = gettextdimensions(draw, s, fontsize, isbold)
-    ox,oy = thefont.getoffset(s)
+    ox,oy = gettextoffset(thefont,s)
     sw += ox
     sh += oy
     draw.text(xy=(x-sw,y), text=s, font=thefont, fill=textcolor)
 
 def drawrighttext(draw, s, fontsize, x, y, textcolor=colorFFFFFF, isbold=False):
     sw,sh,thefont = gettextdimensions(draw, s, fontsize, isbold)
-    ox,oy = thefont.getoffset(s)
+    ox,oy = gettextoffset(thefont,s)
     sw += ox
     sh += oy
     draw.text(xy=(x-sw,y-(sh/2)), text=s, font=thefont, fill=textcolor)
 
 def drawlefttext(draw, s, fontsize, x, y, textcolor=colorFFFFFF, isbold=False):
     sw,sh,thefont = gettextdimensions(draw, s, fontsize, isbold)
-    ox,oy = thefont.getoffset(s)
+    ox,oy = gettextoffset(thefont,s)
     sw += ox
     sh += oy
     draw.text(xy=(x,y-(sh/2)), text=s, font=thefont, fill=textcolor)