Changeset cfd84bd

Timestamp:

Mar 15, 2018 3:50:33 PM (2 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

144147d

Parents:

1de82a68

Message:

i2psnark: Don't fail to start if data directory not found (ticket #2166)
Try to create dir if doesn't exist
Hide add and create sections if dir not writable
Remove 403 handler, don't want it for standalone hostname check

Files:

• apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java (modified) (2 diffs)
• apps/i2psnark/java/src/org/klomp/snark/web/BasicServlet.java (modified) (3 diffs)
• apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java (modified) (2 diffs)
• apps/i2psnark/web.xml (modified) (1 diff)
• history.txt (modified) (2 diffs)
• router/java/src/net/i2p/router/RouterVersion.java (modified) (1 diff)

apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java

@@ -1059 +1059 @@
         }
 
+        // set this before we check the data dir
+        if (areFilesPublic() != filesPublic) {
+            _config.setProperty(PROP_FILES_PUBLIC, Boolean.toString(filesPublic));
+            _util.setFilesPublic(filesPublic);
+            if (filesPublic)
+                addMessage(_t("New files will be publicly readable"));
+            else
+                addMessage(_t("New files will not be publicly readable"));
+            changed = true;
+        }
+
         if (dataDir != null && !dataDir.equals(getDataDir().getAbsolutePath())) {
             dataDir = DataHelper.stripHTML(dataDir.trim());
-            File dd = new File(dataDir);
+            File dd = areFilesPublic() ? new File(dataDir) : new SecureDirectory(dataDir);
             if (!dd.isAbsolute()) {
                 addMessage(_t("Data directory must be an absolute path") + ": " + dataDir);
-            } else if (!dd.exists()) {
-                addMessage(_t("Data directory does not exist") + ": " + dataDir);
+            } else if (!dd.exists() && !dd.mkdirs()) {
+                // save this tag for now, may need it again
+                if (false)
+                    addMessage(_t("Data directory does not exist") + ": " + dataDir);
+                addMessage(_t("Data directory cannot be created") + ": " + dataDir);
             } else if (!dd.isDirectory()) {
                 addMessage(_t("Not a directory") + ": " + dataDir);
@@ -1197 +1211 @@
             }  // reconnect || changed options
 
-        if (areFilesPublic() != filesPublic) {
-            _config.setProperty(PROP_FILES_PUBLIC, Boolean.toString(filesPublic));
-            _util.setFilesPublic(filesPublic);
-            if (filesPublic)
-                addMessage(_t("New files will be publicly readable"));
-            else
-                addMessage(_t("New files will not be publicly readable"));
-            changed = true;
-        }
-
         if (shouldAutoStart() != autoStart) {
             _config.setProperty(PROP_AUTO_START, Boolean.toString(autoStart));

apps/i2psnark/java/src/org/klomp/snark/web/BasicServlet.java

@@ -40 +40 @@
 import net.i2p.util.ByteCache;
 import net.i2p.util.Log;
+import net.i2p.util.SecureFile;
 import net.i2p.util.SystemVersion;
 
@@ -114 +115 @@
         if (rb!=null)
         {
-            File f = new File(rb);
+            File f = new SecureFile(rb);
             setResourceBase(f);
         }
@@ -125 +126 @@
      *  Files are served from here
      */
-    protected void setResourceBase(File base) throws UnavailableException {
+    protected synchronized void setResourceBase(File base) throws UnavailableException {
         if (!base.isDirectory()) {
-            _log.log(Log.CRIT, "Configured i2psnark directory " + base + " does not exist");
-            throw new UnavailableException("Resource base does not exist: " + base);
+            _log.error("Configured i2psnark directory " + base + " does not exist");
+            //throw new UnavailableException("Resource base does not exist: " + base);
         }
         _resourceBase = base;

apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java

@@ -378 +378 @@
             if (pageOne) {
                 out.write("</div><div id=\"lowersection\">\n");
-                writeAddForm(out, req);
-                writeSeedForm(out, req, sortedTrackers);
+                boolean canWrite;
+                synchronized(this) {
+                    canWrite = _resourceBase.canWrite();
+                }
+                if (canWrite) {
+                    writeAddForm(out, req);
+                    writeSeedForm(out, req, sortedTrackers);
+                }
                 writeConfigLink(out);
                 // end of lowersection div
@@ -693 +699 @@
         if (total == 0) {
             out.write("<tr class=\"snarkTorrentNoneLoaded\">" +
-                      "<td colspan=\"11\"><i>");
-            out.write(_t("No torrents loaded."));
-            out.write("</i></td></tr>\n");
+                      "<td colspan=\"11\">");
+            synchronized(this) {
+                File dd = _resourceBase;
+                if (!dd.exists() && !dd.mkdirs()) {
+                    out.write(_t("Data directory cannot be created") + ": " + DataHelper.escapeHTML(dd.toString()));
+                } else if (!dd.isDirectory()) {
+                    out.write(_t("Not a directory") + ": " + DataHelper.escapeHTML(dd.toString()));
+                } else if (!dd.canRead()) {
+                    out.write(_t("Unreadable") + ": " + DataHelper.escapeHTML(dd.toString()));
+                } else if (!dd.canWrite()) {
+                    out.write(_t("No write permissions for data directory") + ": " + DataHelper.escapeHTML(dd.toString()));
+                } else {
+                    out.write(_t("No torrents loaded."));
+                }
+            }
+            out.write("</td></tr>\n");
         } else /** if (snarks.size() > 1) */ {
             out.write("<tfoot><tr>\n" +

apps/i2psnark/web.xml

@@ -52 +52 @@
 
     <error-page>
-        <error-code>403</error-code>
-        <location>/.error</location>
-    </error-page>
-    <error-page>
         <error-code>404</error-code>
         <location>/.error</location>

history.txt

@@ +1 @@
+2018-03-15 zzz
+ * i2psnark: Start even if data directory not found (ticket #2166)
+
 2018-03-14 zzz
  * Console:
@@ -5 +8 @@
    - Add error handler to webapps (ticket #2155)
  * i2ptunnel: Hide links to webapps that are not runnning (ticket #2161)
- * SusDNS: Translate svg image text (ticket #1749)
+ * SusiDNS: Translate svg image text (ticket #1749)
+ * SusiMail: Shorten URLs
 
 2018-03-12 zzz
- * Susimail: Fix up compose.js (ticket #2176)
+ * SusiMail: Fix up compose.js (ticket #2176)
 
 2018-03-11 zzz

router/java/src/net/i2p/router/RouterVersion.java

@@ -19 +19 @@
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 18;
+    public final static long BUILD = 19;
 
     /** for example "-test" */