Author: nextgens
Date: 2008-06-01 09:06:29 +0000 (Sun, 01 Jun 2008)
New Revision: 20173
Modified:
trunk/apps/new_installer/res/unix/bin/install_frost.sh
trunk/apps/new_installer/res/unix/bin/install_jSite.sh
trunk/apps/new_installer/res/unix/bin/install_librarian.sh
trunk/apps/new_installer/res/unix/bin/install_mdns.sh
trunk/apps/new_installer/res/unix/bin/install_opennet.sh
trunk/apps/new_installer/res/unix/bin/install_stun.sh
trunk/apps/new_installer/res/unix/bin/install_thaw.sh
trunk/apps/new_installer/res/unix/bin/install_thingamablog.sh
trunk/apps/new_installer/res/unix/bin/install_updater.sh
trunk/apps/new_installer/res/unix/bin/install_upnp.sh
trunk/apps/new_installer/res/windows/bin/install_frost.cmd
trunk/apps/new_installer/res/windows/bin/install_jsite.cmd
trunk/apps/new_installer/res/windows/bin/install_opennet.cmd
trunk/apps/new_installer/res/windows/bin/install_plugins.cmd
trunk/apps/new_installer/res/windows/bin/install_thaw.cmd
trunk/apps/new_installer/res/windows/bin/install_thingamablog.cmd
trunk/apps/new_installer/res/windows/bin/install_updater.cmd
trunk/apps/new_installer/scripts/1run.sh
trunk/apps/new_installer/src/Sha1Test.java
Log:
new_installer: make the installer to use the new vhost... the current setup
doesn't work anymore anyway :(
Modified: trunk/apps/new_installer/res/unix/bin/install_frost.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_frost.sh 2008-06-01
06:20:18 UTC (rev 20172)
+++ trunk/apps/new_installer/res/unix/bin/install_frost.sh 2008-06-01
09:06:29 UTC (rev 20173)
@@ -9,7 +9,7 @@
if test ! -e offline
then
echo "Downloading frost"
- java $JOPTS -jar bin/sha1test.jar frost/frost.zip ./ >/dev/null
2>&1 || exit 1
+ java $JOPTS -jar bin/sha1test.jar frost.zip ./ >/dev/null 2>&1
|| exit 1
fi
echo "Unzipping frost"
mkdir frost
Modified: trunk/apps/new_installer/res/unix/bin/install_jSite.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_jSite.sh 2008-06-01
06:20:18 UTC (rev 20172)
+++ trunk/apps/new_installer/res/unix/bin/install_jSite.sh 2008-06-01
09:06:29 UTC (rev 20173)
@@ -10,6 +10,6 @@
then
echo "Downloading jSite"
mkdir jSite
- java $JOPTS -jar bin/sha1test.jar jSite/jSite.jar jSite
"$CAFILE" >/dev/null 2>&1 || exit 1
+ java $JOPTS -jar bin/sha1test.jar jSite.jar jSite "$CAFILE"
>/dev/null 2>&1 || exit 1
fi
fi
Modified: trunk/apps/new_installer/res/unix/bin/install_librarian.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_librarian.sh 2008-06-01
06:20:18 UTC (rev 20172)
+++ trunk/apps/new_installer/res/unix/bin/install_librarian.sh 2008-06-01
09:06:29 UTC (rev 20173)
@@ -12,8 +12,7 @@
mv -f plug2 plug
if test ! -e offline
then
- java $JOPTS -jar bin/sha1test.jar plugins/XMLLibrarian.jar.url
plugins "$CAFILE" >/dev/null 2>&1
- mv plugins/XMLLibrarian.jar.url plugins/XMLLibrarian.jar
+ java $JOPTS -jar bin/sha1test.jar XMLLibrarian.jar plugins
"$CAFILE" >/dev/null 2>&1
fi
rm -f xmllibrarian
fi
Modified: trunk/apps/new_installer/res/unix/bin/install_mdns.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_mdns.sh 2008-06-01
06:20:18 UTC (rev 20172)
+++ trunk/apps/new_installer/res/unix/bin/install_mdns.sh 2008-06-01
09:06:29 UTC (rev 20173)
@@ -12,8 +12,7 @@
mv -f plug2 plug
if test ! -e offline
then
- java $JOPTS -jar bin/sha1test.jar plugins/MDNSDiscovery.jar.url
plugins "$CAFILE" >/dev/null 2>&1
- mv plugins/MDNSDiscovery.jar.url plugins/MDNSDiscovery.jar
+ java $JOPTS -jar bin/sha1test.jar MDNSDiscovery.jar plugins
"$CAFILE" >/dev/null 2>&1
fi
rm -f mdns
fi
Modified: trunk/apps/new_installer/res/unix/bin/install_opennet.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_opennet.sh 2008-06-01
06:20:18 UTC (rev 20172)
+++ trunk/apps/new_installer/res/unix/bin/install_opennet.sh 2008-06-01
09:06:29 UTC (rev 20173)
@@ -9,6 +9,6 @@
if test ! -e offline
then
echo "Downloading the Opennet seednode file"
- java $JOPTS -jar bin/sha1test.jar opennet/seednodes.fref .
"$CAFILE" >/dev/null 2>&1 || exit 1
+ java $JOPTS -jar bin/sha1test.jar seednodes.fref . "$CAFILE"
>/dev/null 2>&1 || exit 1
fi
fi
Modified: trunk/apps/new_installer/res/unix/bin/install_stun.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_stun.sh 2008-06-01
06:20:18 UTC (rev 20172)
+++ trunk/apps/new_installer/res/unix/bin/install_stun.sh 2008-06-01
09:06:29 UTC (rev 20173)
@@ -12,8 +12,7 @@
mv -f plug2 plug
if test ! -e offline
then
- java $JOPTS -jar bin/sha1test.jar plugins/JSTUN.jar.url plugins
"$CAFILE" >/dev/null 2>&1
- mv plugins/JSTUN.jar.url plugins/JSTUN.jar
+ java $JOPTS -jar bin/sha1test.jar JSTUN.jar plugins "$CAFILE"
>/dev/null 2>&1
fi
rm -f stun
fi
Modified: trunk/apps/new_installer/res/unix/bin/install_thaw.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_thaw.sh 2008-06-01
06:20:18 UTC (rev 20172)
+++ trunk/apps/new_installer/res/unix/bin/install_thaw.sh 2008-06-01
09:06:29 UTC (rev 20173)
@@ -10,6 +10,6 @@
then
echo "Downloading Thaw"
mkdir Thaw
- java $JOPTS -jar bin/sha1test.jar Thaw/Thaw.jar Thaw "$CAFILE"
>/dev/null 2>&1 || exit 1
+ java $JOPTS -jar bin/sha1test.jar Thaw.jar Thaw "$CAFILE"
>/dev/null 2>&1 || exit 1
fi
fi
Modified: trunk/apps/new_installer/res/unix/bin/install_thingamablog.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_thingamablog.sh
2008-06-01 06:20:18 UTC (rev 20172)
+++ trunk/apps/new_installer/res/unix/bin/install_thingamablog.sh
2008-06-01 09:06:29 UTC (rev 20173)
@@ -9,7 +9,7 @@
if test ! -e offline
then
echo "Downloading thingamablog"
- java $JOPTS -jar bin/sha1test.jar thingamablog/thingamablog.zip
./ "$CAFILE" >/dev/null 2>&1 || exit 1
+ java $JOPTS -jar bin/sha1test.jar thingamablog.zip ./ "$CAFILE"
>/dev/null 2>&1 || exit 1
fi
echo "Unzipping thingamablog"
java $JOPTS -jar bin/uncompress.jar thingamablog.zip . >/dev/null 2>&1
Modified: trunk/apps/new_installer/res/unix/bin/install_updater.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_updater.sh 2008-06-01
06:20:18 UTC (rev 20172)
+++ trunk/apps/new_installer/res/unix/bin/install_updater.sh 2008-06-01
09:06:29 UTC (rev 20173)
@@ -15,7 +15,7 @@
if test ! -e offline
then
echo "Downloading update.sh"
- java $JOPTS -jar bin/sha1test.jar update/update.sh ./ "$CAFILE"
>/dev/null 2>&1 || exit 1
+ java $JOPTS -jar bin/sha1test.jar update.sh ./ "$CAFILE" >/dev/null
2>&1 || exit 1
fi
if test -e update.sh
Modified: trunk/apps/new_installer/res/unix/bin/install_upnp.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_upnp.sh 2008-06-01
06:20:18 UTC (rev 20172)
+++ trunk/apps/new_installer/res/unix/bin/install_upnp.sh 2008-06-01
09:06:29 UTC (rev 20173)
@@ -12,8 +12,7 @@
mv -f plug2 plug
if test ! -e offline
then
- java $JOPTS -jar bin/sha1test.jar plugins/UPnP.jar.url plugins
"$CAFILE" >/dev/null 2>&1
- mv plugins/UPnP.jar.url plugins/UPnP.jar
+ java $JOPTS -jar bin/sha1test.jar UPnP.jar plugins "$CAFILE"
>/dev/null 2>&1
fi
rm -f upnp
fi
Modified: trunk/apps/new_installer/res/windows/bin/install_frost.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/install_frost.cmd 2008-06-01
06:20:18 UTC (rev 20172)
+++ trunk/apps/new_installer/res/windows/bin/install_frost.cmd 2008-06-01
09:06:29 UTC (rev 20173)
@@ -9,7 +9,7 @@
@del /F frost.install > NUL
@if exist offline goto end
@echo Downloading Frost
- at java -jar bin\sha1test.jar frost/frost.zip . %CAFILE% > NUL
+ at java -jar bin\sha1test.jar frost.zip . %CAFILE% > NUL
:end
@echo Setting Frost up
@mkdir frost
Modified: trunk/apps/new_installer/res/windows/bin/install_jsite.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/install_jsite.cmd 2008-06-01
06:20:18 UTC (rev 20172)
+++ trunk/apps/new_installer/res/windows/bin/install_jsite.cmd 2008-06-01
09:06:29 UTC (rev 20173)
@@ -10,8 +10,7 @@
@if exist offline goto end
@echo Downloading jSite
@mkdir jSite
- at java -jar bin\sha1test.jar jSite/jSite.jar . %CAFILE% > NUL
- at move jSite.jar jSite > NUL
+ at java -jar bin\sha1test.jar jSite.jar jSite %CAFILE% > NUL
:end
@echo @cd jSite > jsite.cmd
@echo @start javaw -jar jSite.jar >> jsite.cmd
Modified: trunk/apps/new_installer/res/windows/bin/install_opennet.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/install_opennet.cmd
2008-06-01 06:20:18 UTC (rev 20172)
+++ trunk/apps/new_installer/res/windows/bin/install_opennet.cmd
2008-06-01 09:06:29 UTC (rev 20173)
@@ -10,5 +10,5 @@
@if exist offline goto end
@echo Downloading the Opennet seednode file
- at java -jar bin\sha1test.jar opennet/seednodes.fref . %CAFILE% > NUL
+ at java -jar bin\sha1test.jar seednodes.fref . %CAFILE% > NUL
:end
Modified: trunk/apps/new_installer/res/windows/bin/install_plugins.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/install_plugins.cmd
2008-06-01 06:20:18 UTC (rev 20172)
+++ trunk/apps/new_installer/res/windows/bin/install_plugins.cmd
2008-06-01 09:06:29 UTC (rev 20173)
@@ -13,9 +13,7 @@
@echo -JSTUN
@set PLUGINS=JSTUN;%PLUGINS%
@if exist offline goto end1
- at java -jar bin\sha1test.jar plugins/JSTUN.jar.url plugins %CAFILE% > NUL
- at if exist plugins\JSTUN.jar del /F plugins\JSTUN.jar > NUL
- at move plugins\JSTUN.jar.url plugins\JSTUN.jar > NUL
+ at java -jar bin\sha1test.jar JSTUN.jar plugins %CAFILE% > NUL
:end1
@del /F stun > NUL
:nostun
@@ -24,9 +22,7 @@
@echo -MDNSDiscovery
@set PLUGINS=MDNSDiscovery;%PLUGINS%
@if exist offline goto end2
- at java -jar bin\sha1test.jar plugins/MDNSDiscovery.jar.url plugins %CAFILE%
> NUL
- at if exist plugins\MDNSDiscovery.jar del /F plugins\MDNSDiscovery.jar > NUL
- at move plugins\MDNSDiscovery.jar.url plugins\MDNSDiscovery.jar > NUL
+ at java -jar bin\sha1test.jar MDNSDiscovery.jar plugins %CAFILE% > NUL
:end2
@del /F mdns > NUL
:nomdns
@@ -35,9 +31,7 @@
@echo -UPnP
@set PLUGINS=UPnP;%PLUGINS%
@if exist offline goto end3
- at java -jar bin\sha1test.jar plugins/UPnP.jar.url plugins %CAFILE% > NUL
- at if exist plugins\UPnP.jar del /F plugins\UPnP.jar > NUL
- at move plugins\UPnP.jar.url plugins\UPnP.jar
+ at java -jar bin\sha1test.jar UPnP.jar plugins %CAFILE% > NUL
:end3
@del /F upnp > NUL
:noupnp
@@ -46,9 +40,7 @@
@echo -XMLLibrarian
@set PLUGINS=XMLLibrarian;%PLUGINS%
@if exist offline goto end4
- at java -jar bin\sha1test.jar plugins/XMLLibrarian.jar.url plugins %CAFILE% >
NUL
- at if exist plugins\XMLLibrarian.jar del /F plugins\XMLLibrarian.jar > NUL
- at move plugins\XMLLibrarian.jar.url plugins\XMLLibrarian.jar
+ at java -jar bin\sha1test.jar XMLLibrarian.jar plugins %CAFILE% > NUL
:end4
@del /F xmllibrarian > NUL
:nolibrarian
Modified: trunk/apps/new_installer/res/windows/bin/install_thaw.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/install_thaw.cmd 2008-06-01
06:20:18 UTC (rev 20172)
+++ trunk/apps/new_installer/res/windows/bin/install_thaw.cmd 2008-06-01
09:06:29 UTC (rev 20173)
@@ -10,8 +10,7 @@
@echo Downloading Thaw
@if exist offline goto end
@mkdir Thaw
- at java -jar bin\sha1test.jar Thaw/Thaw.jar %CAFILE% > NUL
- at move Thaw.jar Thaw > NUL
+ at java -jar bin\sha1test.jar Thaw.jar %CAFILE% > NUL
:end
@echo Setting Thaw up
@echo @cd Thaw >thaw.cmd
Modified: trunk/apps/new_installer/res/windows/bin/install_thingamablog.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/install_thingamablog.cmd
2008-06-01 06:20:18 UTC (rev 20172)
+++ trunk/apps/new_installer/res/windows/bin/install_thingamablog.cmd
2008-06-01 09:06:29 UTC (rev 20173)
@@ -9,7 +9,7 @@
@del /F thingamablog.install > NUL
@if exist offline goto end
@echo Downloading Thingamablog
- at java -jar bin\sha1test.jar thingamablog/thingamablog.zip . %CAFILE% > NUL
+ at java -jar bin\sha1test.jar thingamablog.zip . %CAFILE% > NUL
:end
@echo Setting Thingamablog up
@java -jar bin\uncompress.jar thingamablog.zip . > NUL
Modified: trunk/apps/new_installer/res/windows/bin/install_updater.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/install_updater.cmd
2008-06-01 06:20:18 UTC (rev 20172)
+++ trunk/apps/new_installer/res/windows/bin/install_updater.cmd
2008-06-01 09:06:29 UTC (rev 20173)
@@ -7,7 +7,7 @@
@echo Downloading update.cmd
@if exist offline goto end
- at java -jar bin\sha1test.jar update/update.cmd . %CAFILE% > NUL
+ at java -jar bin\sha1test.jar update.cmd . %CAFILE% > NUL
:end
@echo node.updater.enabled=true>> freenet.ini
Modified: trunk/apps/new_installer/scripts/1run.sh
===================================================================
--- trunk/apps/new_installer/scripts/1run.sh 2008-06-01 06:20:18 UTC (rev
20172)
+++ trunk/apps/new_installer/scripts/1run.sh 2008-06-01 09:06:29 UTC (rev
20173)
@@ -63,10 +63,10 @@
echo "Downloading freenet-ext.jar"
java -jar bin/sha1test.jar freenet-ext.jar "." $CAFILE >/dev/null || exit 1
echo "Downloading update.sh"
-java -jar bin/sha1test.jar update/update.sh "." $CAFILE >/dev/null || exit 1
+java -jar bin/sha1test.jar update.sh "." $CAFILE >/dev/null || exit 1
chmod a+rx "./update.sh"
echo "Downloading seednodes.fref"
-java -jar bin/sha1test.jar opennet/seednodes.fref "." $CAFILE >/dev/null ||
exit 1
+java -jar bin/sha1test.jar seednodes.fref "." $CAFILE >/dev/null || exit 1
# Starting the node up
./run.sh start
Modified: trunk/apps/new_installer/src/Sha1Test.java
===================================================================
--- trunk/apps/new_installer/src/Sha1Test.java 2008-06-01 06:20:18 UTC (rev
20172)
+++ trunk/apps/new_installer/src/Sha1Test.java 2008-06-01 09:06:29 UTC (rev
20173)
@@ -11,6 +11,7 @@
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLConnection;
+import java.net.HttpURLConnection;
import java.security.KeyStore;
import java.security.MessageDigest;
import java.security.cert.Certificate;
@@ -25,8 +26,7 @@
public class Sha1Test {
final static int BUFFERSIZE = 4096;
- final static String BASE_DOWNLOAD_URL =
"http://downloads.freenetproject.org/alpha/";;
- final static String BASE_CHECKSUM_URL =
"https://checksums.freenetproject.org/alpha/";;
+ final static String BASE_URL =
"https://checksums.freenetproject.org/latest/";;
static boolean useSecureMode = false;
public static void main(String[] args) {
@@ -168,13 +168,10 @@
BufferedOutputStream os = null;
try {
- if(checksum)
- url = new URL((useSecureMode ?
BASE_CHECKSUM_URL : BASE_DOWNLOAD_URL) + file + ".sha1");
- else
- url = new URL(BASE_DOWNLOAD_URL + file);
+ url = new URL(BASE_URL + file + (checksum ? ".sha1" :
""));
System.out.println(url);
URLConnection connection = url.openConnection();
- is = connection.getInputStream();
+ is = openConnectionCheckRedirects(connection);
dis = new DataInputStream(new BufferedInputStream(is));
File f = new File(filename + (checksum ? ".sha1" : ""));
os = new BufferedOutputStream(new FileOutputStream(f));
@@ -200,4 +197,52 @@
try { if(os != null) os.close(); } catch(IOException
ioe) {}
}
}
+
+ private static InputStream openConnectionCheckRedirects(URLConnection
c) throws IOException
+ {
+ boolean redir;
+ int redirects = 0;
+ InputStream in = null;
+ do
+ {
+ if (c instanceof HttpURLConnection)
+ {
+ ((HttpURLConnection)
c).setInstanceFollowRedirects(false);
+ }
+ // We want to open the input stream before getting
headers
+ // because getHeaderField() et al swallow IOExceptions.
+ in = c.getInputStream();
+ redir = false;
+ if (c instanceof HttpURLConnection)
+ {
+ HttpURLConnection http = (HttpURLConnection) c;
+ int stat = http.getResponseCode();
+ if (stat >= 300 && stat <= 307 && stat != 306 &&
+ stat !=
HttpURLConnection.HTTP_NOT_MODIFIED)
+ {
+ URL base = http.getURL();
+ String loc =
http.getHeaderField("Location");
+ URL target = null;
+ if (loc != null)
+ {
+ target = new URL(base, loc);
+ }
+ http.disconnect();
+ // Redirection should be allowed only
for HTTP and HTTPS
+ // and should be limited to 5
redirections at most.
+ if (target == null ||
!(target.getProtocol().equals("http")
+ ||
target.getProtocol().equals("https"))
+ || redirects >= 5)
+ {
+ throw new
SecurityException("illegal URL redirect");
+ }
+ redir = true;
+ c = target.openConnection();
+ redirects++;
+ }
+ }
+ }
+ while (redir);
+ return in;
+ }
}
