summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSolly Ross <sross@redhat.com>2015-05-11 10:24:38 -0400
committerSolly Ross <sross@redhat.com>2015-05-11 10:24:38 -0400
commit7e623fe05e5e3c8176f00f9ea72a3c5e536c2c0f (patch)
tree94e1f6ae7167e2226da139a2d0495f834a69b589
parent452d9582cc82d640662cebbc1c573c4b1dbeb6b2 (diff)
downloadwebsockify-7e623fe05e5e3c8176f00f9ea72a3c5e536c2c0f.tar.gz
Restore functionaltiy to file_only.
There was a bug in WebSocketServer that prevented the `file_only` parameter from actually being set as an instance property, causing directory listings to appear even with `file_only=True`. This commit fixes that. See-Also: https://bugs.launchpad.net/nova/+bug/1447675
-rw-r--r--websockify/websocket.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/websockify/websocket.py b/websockify/websocket.py
index 9a1306d..20305b8 100644
--- a/websockify/websocket.py
+++ b/websockify/websocket.py
@@ -605,6 +605,7 @@ class WebSocketServer(object):
self.timeout = timeout
self.idle_timeout = idle_timeout
self.traffic = traffic
+ self.file_only = file_only
self.launch_time = time.time()
self.ws_connection = False
@@ -643,7 +644,10 @@ class WebSocketServer(object):
self.listen_host, self.listen_port)
self.msg(" - Flash security policy server")
if self.web:
- self.msg(" - Web server. Web root: %s", self.web)
+ if self.file_only:
+ self.msg(" - Web server (no directory listings). Web root: %s", self.web)
+ else:
+ self.msg(" - Web server. Web root: %s", self.web)
if ssl:
if os.path.exists(self.cert):
self.msg(" - SSL/TLS support")