Bug 871435 - Allow for a customized appcache_path to be used for preinstalled hosted apps using appcache r=ochameau

dom/apps/src/OfflineCacheInstaller.jsm

@@ -36,9 +36,8 @@ function debug(aMsg) {
 
 
 function enableOfflineCacheForApp(origin, appId) {
-  let originURI = Services.io.newURI(origin, null, null);
   let principal = Services.scriptSecurityManager.getAppCodebasePrincipal(
-                    originURI, appId, false);
+                    origin, appId, false);
   Services.perms.addFromPrincipal(principal, 'offline-app',
                                   Ci.nsIPermissionManager.ALLOW_ACTION);
   // Prevent cache from being evicted:
@@ -67,7 +66,6 @@ function storeCache(applicationCache, url, file, itemType) {
       bufferedOutputStream.writeFrom(inputStream, inputStream.available());
       bufferedOutputStream.flush();
       bufferedOutputStream.close();
-      outputStream.close();
       inputStream.close();
 
       cacheEntry.markValid();
@@ -101,18 +99,15 @@ function readFile(aFile, aCallback) {
 }
 
 function parseCacheLine(app, urls, line) {
-  // Prepend webapp origin in case of absolute path
-  if (line[0] == '/') {
-    urls.push(app.origin + line.substring(1));
-  // Just pass along the url, if we have one
-  } else if (line.substr(0, 4) == 'http') {
-    urls.push(line);
-  } else {
-    throw new Error('Only accept absolute path and http/https URLs');
+  try {
+    let url = Services.io.newURI(line, null, app.origin);
+    urls.push(url.spec);
+  } catch(e) {
+    throw new Error('Unable to parse cache line: ' + line + '(' + e + ')');
   }
 }
 
-function parseFallbackLine(app, namespaces, fallbacks, line) {
+function parseFallbackLine(app, urls, namespaces, fallbacks, line) {
   let split = line.split(/[ \t]+/);
   if (split.length != 2) {
     throw new Error('Should be made of two URLs seperated with spaces')
@@ -121,13 +116,16 @@ function parseFallbackLine(app, namespaces, fallbacks, line) {
   let [ namespace, fallback ] = split;
 
   // Prepend webapp origin in case of absolute path
-  if (namespace[0] == '/')
-    namespace = app.origin + namespace.substring(1);
-  if (fallback[0] == '/')
-    fallback = app.origin + fallback.substring(1);
+  try {
+    namespace = Services.io.newURI(namespace, null, app.origin).spec;
+    fallback = Services.io.newURI(fallback, null, app.origin).spec;
+  } catch(e) {
+    throw new Error('Unable to parse fallback line: ' + line + '(' + e + ')');
+  }
 
   namespaces.push([type, namespace, fallback]);
   fallbacks.push(fallback);
+  urls.push(fallback);
 }
 
 function parseNetworkLine(namespaces, line) {
@@ -176,7 +174,7 @@ function parseAppCache(app, path, content) {
       } else if (currentSection == 'NETWORK') {
         parseNetworkLine(namespaces, line);
       } else if (currentSection == 'FALLBACK') {
-        parseFallbackLine(app, namespaces, fallbacks, line);
+        parseFallbackLine(app, urls, namespaces, fallbacks, line);
       }
     } catch(e) {
       throw new Error('Invalid ' + currentSection + ' line in appcache ' +
@@ -194,7 +192,11 @@ function parseAppCache(app, path, content) {
 }
 
 function installCache(app) {
-  let cacheDir = makeFile(app.basePath)
+  if (!app.cachePath) {
+    return;
+  }
+
+  let cacheDir = makeFile(app.cachePath)
   cacheDir.append(app.appId);
   cacheDir.append('cache');
   if (!cacheDir.exists())
@@ -208,7 +210,7 @@ function installCache(app) {
   enableOfflineCacheForApp(app.origin, app.localId);
 
   // Get the url for the manifest.
-  let appcacheURL = app.origin + 'cache/manifest.appcache';
+  let appcacheURL = app.appcache_path;
 
   // The group ID contains application id and 'f' for not being hosted in
   // a browser element, but a mozbrowser iframe.
@@ -222,7 +224,9 @@ function installCache(app) {
 
     entries.urls.forEach(function processCachedFile(url) {
       // Get this nsIFile from cache folder for this URL
-      let path = url.replace(/https?:\/\//, '');
+      // We have absolute urls, so remove the origin part to locate the
+      // files.
+      let path = url.replace(app.origin.spec, '');
       let file = cacheDir.clone();
       let paths = path.split('/');
       paths.forEach(file.append);

dom/apps/src/Webapps.jsm

@@ -263,11 +263,15 @@ this.DOMApplicationRegistry = {
 
   updateOfflineCacheForApp: function updateOfflineCacheForApp(aId) {
     let app = this.webapps[aId];
-    OfflineCacheInstaller.installCache({
-      basePath: app.basePath,
-      appId: aId,
-      origin: app.origin,
-      localId: app.localId
+    this._readManifests([{ id: aId }], function(aResult) {
+      let manifest = new ManifestHelper(aResult[0].manifest, app.origin);
+      OfflineCacheInstaller.installCache({
+        cachePath: app.cachePath,
+        appId: aId,
+        origin: Services.io.newURI(app.origin, null, null),
+        localId: app.localId,
+        appcache_path: manifest.fullAppcachePath()
+      });
     });
   },
 
@@ -320,6 +324,7 @@ this.DOMApplicationRegistry = {
       });
 
     app.installState = "installed";
+    app.cachePath = app.basePath;
     app.basePath = FileUtils.getDir(DIRECTORY_NAME, ["webapps"], true, true)
                             .path;