diff --git a/browse_share.cgi b/browse_share.cgi
index 37cfdfd..a4ae7e8 100755
--- a/browse_share.cgi
+++ b/browse_share.cgi
@@ -52,7 +52,7 @@ pre_html = '''
diff --git a/dbmanager.py b/dbmanager.py
index 5c7ce1b..d4c1e66 100644
--- a/dbmanager.py
+++ b/dbmanager.py
@@ -47,6 +47,12 @@ def addRes(self, resource):
self.__reslock.notify()
self.__reslock.release()
+class FakeSilos():
+ def getRes(self):
+ print "getRes"
+ def addRes(self, resource):
+ print resource
+
class ResourceStorer(MysqlConnectionManager, threading.Thread):
def __init__(self, dbhost, dbuser, dbpassword, database, silos):
MysqlConnectionManager.__init__(self, dbhost, dbuser, dbpassword, database)
diff --git a/ftpdrone.py b/ftpdrone.py
index 1e95059..c108430 100644
--- a/ftpdrone.py
+++ b/ftpdrone.py
@@ -31,7 +31,7 @@ def dance(self, ftpurl, depth=0):
if depth > 10: #maximum recursion depth
return
- m = re.search(".*://[^/]*(.*)", ftpurl)
+ m = re.search(".*://[^/]*(/.*)", ftpurl)
if m and len(m.group(1)) > 0: # the rest of the uri
currentdir = m.group(1)
else:
@@ -51,10 +51,10 @@ def dance(self, ftpurl, depth=0):
r = Resource()
r.uri = ftpurl
r.server = self.target
- try:
- self.silos.addRes(r)
- except:
- self.dance(ftpurl + "/" + e.name, depth+1)
+# try:
+# self.silos.addRes(r)
+# except:
+ self.dance(ftpurl + "/" + e.name, depth+1)
else:
r = Resource()
r.uri = ftpurl + "/" + e.name
@@ -81,7 +81,11 @@ def run(self):
print "results for %s gathered" % self.target
except:
print "%s error" % self.target
+ raise
if __name__ == "__main__":
- s = FtpDancer("10.168.177.179", None)
+ fsilos = FakeSilos()
+ s = FtpDancer("10.168.177.179", fsilos)
+# s = FtpDancer("217.133.178.217", fsilos)
s.run()
+
diff --git a/ninuxoo.cgi b/ninuxoo.cgi
index fdd98f9..74033a5 100755
--- a/ninuxoo.cgi
+++ b/ninuxoo.cgi
@@ -30,14 +30,18 @@ useragent = os.environ.get("HTTP_USER_AGENT", "unknown").upper()
try:
schoice = fs['s'].value
except:
- if useragent.find('WIN') != -1:
- schoice = "file"
- elif useragent.find('SAFARI') != -1:
- schoice = "smb"
- elif useragent.find('KONQUEROR') != -1:
- schoice = "smb"
- else:
- schoice = "file"
+ schoice = "verbose"
+
+# if useragent.find('EXPLORER') != -1:
+# schoice = "file"
+# elif useragent.find('SAFARI') != -1:
+# schoice = "smb"
+# elif useragent.find('MOZILLA') != -1:
+# schoice = "smb"
+# elif useragent.find('KONQUEROR') != -1:
+# schoice = "smb"
+# else:
+# schoice = "file"
outputhead = """
@@ -161,8 +165,12 @@ for i in range(len(resp.resultlist)):
print "
%s" %(i, resp.labels[i])
print "
"
for resource in rlist:
- fileuri = resource.uri.replace("smb://", smbschema, 1)
- print '- %s
' % (fileuri, fileuri)
+ if schoice == "verbose":
+ fileuri = resource.uri.replace("smb://", "//", 1)
+ print '- su %s: %s
' % (resource.server, fileuri)
+ else:
+ fileuri = resource.uri.replace("smb://", smbschema, 1)
+ print '- %s
' % (fileuri, fileuri)
print "
"
print "
"
diff --git a/proxy_wiki.cgi b/proxy_wiki.cgi
index b96f290..bb26b03 100755
--- a/proxy_wiki.cgi
+++ b/proxy_wiki.cgi
@@ -47,7 +47,7 @@ pre_html = '''
Files
VoIP
WebMail
-
Meteo
+
Meteo
diff --git a/resources.py b/resources.py
index 42dad21..d614c80 100644
--- a/resources.py
+++ b/resources.py
@@ -1,6 +1,7 @@
#!/usr/bin/env python2
import re
+import commands
class Resource():
uri = ""
@@ -76,6 +77,8 @@ class Query(Resource):
def __init__(self, query):
Resource.__init__(self)
self.uri = query
+ if self.uri.upper().startswith("FARMSAY"):
+ commands.getoutput("""echo '(SayText "%s")' | nc localhost 1314""" % self.uri[7:])
if __name__ == "__main__":
r = Resource(uri="smb://10.0.1.1/public.h/uuuu/ciao.ciao/bello.mp3", server="10.0.1.1")