Return 404 HTTP error for missed /packages files

4 files changed, 6 insertions, 5 deletions

diff --git a/sugar-network b/sugar-network
index a7c4644..60b09e1 100755
--- a/sugar-network
+++ b/sugar-network
@@ -57,7 +57,7 @@ offline = Option(
         name='offline')
 
 
-_ESCAPE_VALUE_RE = re.compile('([^\[\]\{\}0-9][^\]\[\{\}]+)')
+_ESCAPE_VALUE_RE = re.compile('([^\\[\\]\\{\\}0-9][^\\]\\[\\{\\}]+)')
 
 
 class Application(application.Application):
@@ -234,7 +234,7 @@ app = Application(
         name='sugar-network-client',
         description='Sugar Network client utility',
         epilog='See http://wiki.sugarlabs.org/go/Sugar_Network '
-                 'for details.',
+               'for details.',
         config_files=[
             '/etc/sweets.conf',
             '~/.config/sweets/config',
diff --git a/sugar-network-client b/sugar-network-client
index d215e76..284fa0e 100755
--- a/sugar-network-client
+++ b/sugar-network-client
@@ -205,7 +205,7 @@ app = Application(
         name='sugar-network-client',
         description='Sugar Network client application.',
         epilog='See http://wiki.sugarlabs.org/go/Sugar_Network '
-                 'for details.',
+               'for details.',
         config_files=[
             '/etc/sweets.conf',
             '~/.config/sweets/config',
diff --git a/sugar-network-node b/sugar-network-node
index e46858e..05538ad 100755
--- a/sugar-network-node
+++ b/sugar-network-node
@@ -147,7 +147,7 @@ app = Application(
         name='sugar-network-node',
         description='Sugar Network node server',
         epilog='See http://wiki.sugarlabs.org/go/Sugar_Network '
-                 'for details.',
+               'for details.',
         config_files=[
             '/etc/sugar-network/config',
             '~/.config/sugar-network/config',
diff --git a/sugar_network/node/commands.py b/sugar_network/node/commands.py
index 13dd126..8c69d7b 100644
--- a/sugar_network/node/commands.py
+++ b/sugar_network/node/commands.py
@@ -16,7 +16,7 @@
 import os
 import logging
 import hashlib
-from os.path import join, isdir
+from os.path import join, isdir, exists
 
 from sugar_network import db, node, static
 from sugar_network.node import auth, stats_node
@@ -67,6 +67,7 @@ class NodeCommands(db.VolumeCommands, Commands):
     def route_packages(self, request, response):
         enforce(node.files_root.value, http.BadRequest, 'Disabled')
         path = join(node.files_root.value, *request.path)
+        enforce(exists(path), http.NotFound, 'File was not found')
         if isdir(path):
             response.content_type = 'application/json'
             return os.listdir(path)