From 368331bd08aea18ff9ea45573ae7330ac14f43e5 Mon Sep 17 00:00:00 2001 From: Matthias Strubel Date: Tue, 14 Jun 2016 19:54:51 +0200 Subject: [PATCH 1/5] Fix merge leftover artifact --- CHANGELOG | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 7d022ff..5e14840 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,5 @@ CHANGELOG -<<<<<<< HEAD === 1.1.0 === * [New] Enable / Disable file provisioning for custom lighttpd directory listing * [New] ChatBox message is now in conf/chat_init.txt From 459dfa3e0d4befca6cee1c007c050866f97b0261 Mon Sep 17 00:00:00 2001 From: Matthias Strubel Date: Tue, 14 Jun 2016 19:55:04 +0200 Subject: [PATCH 2/5] First Checklist for PirateBox tests --- CHECKLIST.md | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 CHECKLIST.md diff --git a/CHECKLIST.md b/CHECKLIST.md new file mode 100644 index 0000000..36c229c --- /dev/null +++ b/CHECKLIST.md @@ -0,0 +1,84 @@ +# Image Testing Checklist +If you are part of the testing team, this Checklist is for you. + +## For RaspberryPi +Download the image, dump it to SD card, connect your PirateBox to the same network the computer you are testing from is connected to and then go through the checklist step by step to make sure everything is working as it should. +Before going through the checklist, make sure your USB WiFi is attached and is one of the supported types. Also make sure you have a *FAT32* formatted USB thumb drive attached to your RPi. + +## For OpenWrt +Download the corresponding install_piratebox.zip and .bin file for your device. If you have already a PirateBox running, follow the upgrade instructions. If you install your Software on a fresh device, follow the installation howto +Make sure you PirateBox stopped flashing (indicating the installation is running). On PirateBox 1.1.0 the installation happens in multiple interations. + + +## Checklist +(Skip sections which are not valid for your architecture). + +### Initial configuration setup +* [ ] PirateBox' WiFi is available +* [ ] Connection to PirateBox' WiFi could be established +* [ ] **RPi only** SSH connection to PirateBox with the username *alarm* and the password *alarm* could be established +* [ ] **RPi only** Message of the day containing information about *First Steps* is displayed correctly +* [ ] **RPi only** Change the password for the *alarm* user, log out and log back in +* [ ] **RPi only** Enable USB share +* [ ] Set some date and enable Fake-timeservice +* [ ] Enable Kareha Image and Discussion Board +* [ ] Enable UPnP media server (minidlna) +* [ ] It is possible to post to the chat +* [ ] It is possible to upload files +* [ ] It is possible to post to the board +* [ ] Reboot +* [ ] PirateBox' WiFi is available +* [ ] Connection to PirateBox' WiFi could be established +* [ ] Date matches the set date from the Fake-timeservice + +### Functional tests +**UI in General** +* [ ] UI looks proper, no ugly overlapping +* [ ] UI is responsive on small browser size; is adjusts the look +* [ ] Every URL is working, on main screen +* [ ] Title URLs to mainscreen and Forum are working in Directory-Listing + +**ImageBoard** +* [ ] It is possible to post new threads +* [ ] These threads can be answered on +* [ ] When I come back later to the imageboard and post a reply, the post order is correct. +* [ ] I can upload files (<5MB) to the posts as well + +**Shoutbox** +* [ ] Different color work in Shoutbox , Username can be changed +* [ ] Posting URLs or other HTML like special characters do not break Shoutbox + +**Upload** +* [ ] Upload of different filetypes works +* [ ] Multiple files can be uploaded +* [ ] The messages inside the upload box are in english or my language +* [ ] Special characters are correctly uploaded +* [ ] It is not possible to upload a file named index.html + +**Directory Listing** +* [ ] Download of files is possible +* [ ] Directory listing reacts responsive on screen size changes +* [ ] Created folders are accessiable (UI is deployed after reboot) +* [ ] URLs to mainpage and forum in subfolder work +* [ ] Special character files uploaded via upload functionality work + +**UPNP Server** +* [ ] Streaming of MP3 works via an UPNP client +* [ ] It is possible to stream videos via UPNP + +**IRC Server** +* [ ] Is started after activation in piratebox.conf +* [ ] With an IRC client, the IRC server is usable +* [ ] New channels can be created + +**Customization** +* [ ] Changes on the folder "content" on the USB Stick (**valid for OpenWrt** and RPI **with USB Storage mod**) are visible on the browser +* [ ] PHP was sucessfully enabled in lighttpd.conf and fastcgi processes are visible in "ps" +* [ ] My custom PHP script is working in /content folder +* [ ] Deleting the content folder creates a new folder after a reboot +* [ ] It is possible to change the visible hostname of piratebox using the install_piratebox.sh script + +**Enhanced Network Configuration** +* [ ] Clients with static DNS Server entries work while being connected to PirateBox (PirateBox interferes here) +* [ ] One Client can not ping or connect to another Client (directly via wifi) +* [ ] From 7950472e0e4cd3d55d18604a382a192e44a6749c Mon Sep 17 00:00:00 2001 From: Matthias Strubel Date: Tue, 14 Jun 2016 20:09:28 +0200 Subject: [PATCH 3/5] Droopy: Make chmod optional. Droopy always does the chmod operation, if the option is set. On partitions with FAT it is not possible to execute this operation. Droopy may ran into issue in that situation. With that fix, the option won't be set on droopy start to prevent any chmod operation on FAT partitions. Fixes #154 --- CHANGELOG | 1 + Makefile | 1 + piratebox/piratebox/conf/piratebox.conf | 2 ++ piratebox/piratebox/init.d/piratebox | 4 +++- piratebox/piratebox/init.d/piratebox_alt | 4 +++- 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 5e14840..9bbe079 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -20,6 +20,7 @@ CHANGELOG * [Changed] Send HTTP-Code 204 via PHP, much cleaner * [Changed] Update jQuery to 2.2.3, removes IE <=8 support * [Changed] Redirect happens now always to wished domain name +* [Changed] Droopy, make chmod operation optional (prevent errors on OpenWRT) * [Fix] License Adjustments * [Fix] Prevent JS Injection in Shoutbox * [Fix] Shoutbox: Missing blank between author and content diff --git a/Makefile b/Makefile index b1e94f0..012f8a3 100644 --- a/Makefile +++ b/Makefile @@ -64,6 +64,7 @@ $(OPENWRT_CONFIG_FOLDER): sed 's:DNSMASQ_INTERFACE="wlan0":DNSMASQ_INTERFACE="br-lan":' -i $@/piratebox.conf sed 's:192.168.77:192.168.1:g' -i $@/piratebox.conf sed 's:DROOPY_USE_USER="yes":DROOPY_USE_USER="no":' -i $@/piratebox.conf + sed 's:DROOPY_CHMOD:#DROOPY_CHMOD:' -i $@/piratebox.conf sed 's:LEASE_FILE_LOCATION=$$PIRATEBOX_FOLDER/tmp/lease.file:LEASE_FILE_LOCATION=/tmp/lease.file:' -i $@/piratebox.conf sed 's:TIMESAVE_FORMAT="":TIMESAVE_FORMAT="+%C%g%m%d%H%M":' -i $@/piratebox.conf sed 's:FIREWALL_FETCH_DNS="yes":FIREWALL_FETCH_DNS="no":' -i $@/firewall.conf diff --git a/piratebox/piratebox/conf/piratebox.conf b/piratebox/piratebox/conf/piratebox.conf index e4acc74..87ac41c 100644 --- a/piratebox/piratebox/conf/piratebox.conf +++ b/piratebox/piratebox/conf/piratebox.conf @@ -129,7 +129,9 @@ IMAGE="$PIRATEBOX_FOLDER/src/$IMAGENAME" DROOPY_TXT="" DROOPY_PORT="8080" # Set correct permissions for an uploaded file +# The following line needs to be commented for FAT32 / vfat partitions DROOPY_CHMOD="755" + DROOPY_USERDIR="" # Uncomment line below for adding directory feature #DROOPY_USERDIR=" -u True " diff --git a/piratebox/piratebox/init.d/piratebox b/piratebox/piratebox/init.d/piratebox index 0378a90..40a3e8b 100755 --- a/piratebox/piratebox/init.d/piratebox +++ b/piratebox/piratebox/init.d/piratebox @@ -173,7 +173,9 @@ case "$1" in if [ "$DROOPY_USE_USER" = "yes" ] ; then DROOPY_USER=" -c $LIGHTTPD_USER:$LIGHTTPD_GROUP " fi - start-stop-daemon $DROOPY_USER -m --start --background --pidfile $PIDFILE_DROOPY --exec $PIRATEBOX/bin/droopy -- -d "$UPLOADFOLDER" -m "$DROOPY_TXT" --chmod $DROOPY_CHMOD $DROOPY_USERDIR $DROOPY_PORT + DROOPY_DO_CHMOD="" + test -n "$DROOPY_CHMOD" && DROOPY_DO_CHMOD="--chmod $DROOPY_CHMOD" + start-stop-daemon $DROOPY_USER -m --start --background --pidfile $PIDFILE_DROOPY --exec $PIRATEBOX/bin/droopy -- -d "$UPLOADFOLDER" -m "$DROOPY_TXT" $DROOPY_DO_CHMOD $DROOPY_USERDIR $DROOPY_PORT log_end_msg $? fi diff --git a/piratebox/piratebox/init.d/piratebox_alt b/piratebox/piratebox/init.d/piratebox_alt index 7d382fc..06d76eb 100755 --- a/piratebox/piratebox/init.d/piratebox_alt +++ b/piratebox/piratebox/init.d/piratebox_alt @@ -167,7 +167,9 @@ case "$1" in if [ "$DROOPY_USE_USER" = "yes" ] ; then DROOPY_USER=" -c $LIGHTTPD_USER:$LIGHTTPD_GROUP " fi - start-stop-daemon $DROOPY_USER -m -S -b -p $PIDFILE_DROOPY -x $PIRATEBOX/bin/droopy -- -d "$UPLOADFOLDER" -m "$DROOPY_TXT" --chmod $DROOPY_CHMOD $DROOPY_USERDIR $DROOPY_PORT + DROOPY_DO_CHMOD="" + test -n "$DROOPY_CHMOD" && DROOPY_DO_CHMOD="--chmod $DROOPY_CHMOD" + start-stop-daemon $DROOPY_USER -m -S -b -p $PIDFILE_DROOPY -x $PIRATEBOX/bin/droopy -- -d "$UPLOADFOLDER" -m "$DROOPY_TXT" $DROOPY_DO_CHMOD $DROOPY_USERDIR $DROOPY_PORT echo $? fi From 7d2f09116c6fda095e1551de1d956f54aa56fcd4 Mon Sep 17 00:00:00 2001 From: TheExpertNoob Date: Wed, 15 Jun 2016 12:38:02 -0500 Subject: [PATCH 4/5] Update motd.txt version Updated version from 1.0.7 to 1.1.0 --- piratebox/piratebox/rpi/motd.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/piratebox/piratebox/rpi/motd.txt b/piratebox/piratebox/rpi/motd.txt index d8f9b8a..86c4354 100644 --- a/piratebox/piratebox/rpi/motd.txt +++ b/piratebox/piratebox/rpi/motd.txt @@ -5,8 +5,8 @@ ____________________.__ __ __________ |____|_ /|____| |__||__| (____ /__| \___ >______ /\____/__/\_ \ \/ \/ \/ \/ \/ -Website: http://piratebox.cc PirateBox Version: 1.0.7 -Forum: http://forum.piratebox.cc RPi Image Version: 1.0.7-1 +Website: http://piratebox.cc PirateBox Version: 1.1.0 +Forum: http://forum.piratebox.cc RPi Image Version: 1.1.0-1 IRC: #piratebox irc.freenode.net Be open -- Share freely! First Steps After Flashing From 6fb6de55b703872469113e548a9c79bf5e5ce1f9 Mon Sep 17 00:00:00 2001 From: Matthias Strubel Date: Mon, 27 Jun 2016 21:45:07 +0200 Subject: [PATCH 5/5] hostapd.conf: default client isolation paramter Fixes #157 --- piratebox/piratebox/conf/hostapd.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/piratebox/piratebox/conf/hostapd.conf b/piratebox/piratebox/conf/hostapd.conf index 3f65ac4..7e93096 100644 --- a/piratebox/piratebox/conf/hostapd.conf +++ b/piratebox/piratebox/conf/hostapd.conf @@ -5,3 +5,7 @@ hw_mode=g channel=1 #auth_algs=1 #ieee80211n=1 + +# Put a # in front of the following line to allow +# direct client 2 client communication +ap_isolate=1