](https://play.google.com/store/apps/details?id=in.canews.zeronet)
+
+#### Docker
+There is an official image, built from source at: https://hub.docker.com/r/nofish/zeronet/
### Install from source
diff --git a/plugins/AnnounceZero/AnnounceZeroPlugin.py b/plugins/AnnounceZero/AnnounceZeroPlugin.py
index 7f31e052..623cd4b5 100644
--- a/plugins/AnnounceZero/AnnounceZeroPlugin.py
+++ b/plugins/AnnounceZero/AnnounceZeroPlugin.py
@@ -133,8 +133,8 @@ class SiteAnnouncerPlugin(object):
tracker_peer.remove() # Close connection, we don't need it in next 5 minute
self.site.log.debug(
- "Tracker announce result: zero://%s (sites: %s, new peers: %s, add: %s) in %.3fs" %
- (tracker_address, site_index, peers_added, add_types, time.time() - s)
+ "Tracker announce result: zero://%s (sites: %s, new peers: %s, add: %s, mode: %s) in %.3fs" %
+ (tracker_address, site_index, peers_added, add_types, mode, time.time() - s)
)
return True
diff --git a/plugins/Benchmark/BenchmarkPlugin.py b/plugins/Benchmark/BenchmarkPlugin.py
index 8af140d8..b47da642 100644
--- a/plugins/Benchmark/BenchmarkPlugin.py
+++ b/plugins/Benchmark/BenchmarkPlugin.py
@@ -193,7 +193,7 @@ class ActionsPlugin:
sys.exit(1)
else:
num_failed = len([res_key for res_key, res_val in res.items() if res_val != "ok"])
- num_success = len([res_key for res_key, res_val in res.items() if res_val != "ok"])
+ num_success = len([res_key for res_key, res_val in res.items() if res_val == "ok"])
yield "* Result:\n"
yield " - Total: %s tests\n" % len(res)
yield " - Success: %s tests\n" % num_success
@@ -340,6 +340,32 @@ class ActionsPlugin:
yield "."
assert ok, "does not verify from %s" % address
+ def testPortCheckers(self):
+ """
+ Test all active open port checker
+ """
+ from Peer import PeerPortchecker
+ for ip_type, func_names in PeerPortchecker.PeerPortchecker.checker_functions.items():
+ yield "\n- %s:" % ip_type
+ for func_name in func_names:
+ yield "\n - Tracker %s: " % func_name
+ try:
+ for res in self.testPortChecker(func_name):
+ yield res
+ except Exception as err:
+ yield Debug.formatException(err)
+
+ def testPortChecker(self, func_name):
+ """
+ Test single open port checker
+ """
+ from Peer import PeerPortchecker
+ peer_portchecker = PeerPortchecker.PeerPortchecker(None)
+ s = time.time()
+ announce_func = getattr(peer_portchecker, func_name)
+ res = announce_func(3894)
+ yield res
+
def testAll(self):
"""
Run all tests to check system compatibility with ZeroNet functions
@@ -361,4 +387,9 @@ class ConfigPlugin(object):
'--filter', help='Filter running benchmark',
default=None, metavar='test name'
)
+ elif self.getCmdlineValue("test") == "portChecker":
+ self.test_parser.add_argument(
+ '--func_name', help='Name of open port checker function',
+ default=None, metavar='func_name'
+ )
return back
diff --git a/plugins/Bigfile/BigfilePlugin.py b/plugins/Bigfile/BigfilePlugin.py
index 41506f13..78a27b05 100644
--- a/plugins/Bigfile/BigfilePlugin.py
+++ b/plugins/Bigfile/BigfilePlugin.py
@@ -391,8 +391,8 @@ class ContentManagerPlugin(object):
def verifyPiece(self, inner_path, pos, piece):
try:
piecemap = self.getPiecemap(inner_path)
- except OSError as err:
- raise VerifyError("Unable to download piecemap: %s" % err)
+ except Exception as err:
+ raise VerifyError("Unable to download piecemap: %s" % Debug.formatException(err))
piece_i = int(pos / piecemap["piece_size"])
if CryptHash.sha512sum(piece, format="digest") != piecemap["sha512_pieces"][piece_i]:
@@ -597,6 +597,9 @@ class BigFile(object):
whence = 0
return self.f.seek(pos, whence)
+ def seekable(self):
+ return self.f.seekable()
+
def tell(self):
return self.f.tell()
diff --git a/plugins/ContentFilter/ContentFilterStorage.py b/plugins/ContentFilter/ContentFilterStorage.py
index 70409d6b..289ec2a9 100644
--- a/plugins/ContentFilter/ContentFilterStorage.py
+++ b/plugins/ContentFilter/ContentFilterStorage.py
@@ -137,7 +137,7 @@ class ContentFilterStorage(object):
if not include_site:
continue
content = include_site.storage.loadJson(include["inner_path"])
- details = content.get("siteblocks").get(address)
+ details = content.get("siteblocks", {}).get(address)
if details:
details["include"] = include
break
diff --git a/plugins/Cors/CorsPlugin.py b/plugins/Cors/CorsPlugin.py
index a26c5c2b..c9437538 100644
--- a/plugins/Cors/CorsPlugin.py
+++ b/plugins/Cors/CorsPlugin.py
@@ -2,6 +2,7 @@ import re
import html
import copy
import os
+import gevent
from Plugin import PluginManager
from Translate import Translate
@@ -74,28 +75,53 @@ class UiWebsocketPlugin(object):
return self.corsFuncWrapper("actionOptionalFileInfo", to, inner_path, *args, **kwargs)
def actionCorsPermission(self, to, address):
- site = self.server.sites.get(address)
- if site:
- site_name = site.content_manager.contents.get("content.json", {}).get("title")
- button_title = _["Grant"]
+ if isinstance(address, list):
+ addresses = address
else:
- site_name = address
- button_title = _["Grant & Add"]
+ addresses = [address]
- if site and "Cors:" + address in self.permissions:
+ button_title = _["Grant"]
+ site_names = []
+ site_addresses = []
+ for address in addresses:
+ site = self.server.sites.get(address)
+ if site:
+ site_name = site.content_manager.contents.get("content.json", {}).get("title", address)
+ else:
+ site_name = address
+ # If at least one site is not downloaded yet, show "Grant & Add" instead
+ button_title = _["Grant & Add"]
+
+ if not (site and "Cors:" + address in self.permissions):
+ # No site or no permission
+ site_names.append(site_name)
+ site_addresses.append(address)
+
+ if len(site_names) == 0:
return "ignored"
self.cmd(
"confirm",
- [_["This site requests read permission to: %s"] % html.escape(site_name), button_title],
- lambda res: self.cbCorsPermission(to, address)
+ [_["This site requests read permission to: %s"] % ", ".join(map(html.escape, site_names)), button_title],
+ lambda res: self.cbCorsPermission(to, site_addresses)
)
- def cbCorsPermission(self, to, address):
- self.actionPermissionAdd(to, "Cors:" + address)
- site = self.server.sites.get(address)
- if not site:
- self.server.site_manager.need(address)
+ def cbCorsPermission(self, to, addresses):
+ # Add permissions
+ for address in addresses:
+ permission = "Cors:" + address
+ if permission not in self.site.settings["permissions"]:
+ self.site.settings["permissions"].append(permission)
+
+ self.site.saveSettings()
+ self.site.updateWebsocket(permission_added=permission)
+
+ self.response(to, "ok")
+
+ for address in addresses:
+ site = self.server.sites.get(address)
+ if not site:
+ gevent.spawn(self.server.site_manager.need, address)
@PluginManager.registerTo("UiRequest")
diff --git a/plugins/CryptMessage/CryptMessage.py b/plugins/CryptMessage/CryptMessage.py
index 74659404..8349809c 100644
--- a/plugins/CryptMessage/CryptMessage.py
+++ b/plugins/CryptMessage/CryptMessage.py
@@ -32,7 +32,7 @@ def eciesDecryptMulti(encrypted_datas, privatekey):
def eciesDecrypt(ciphertext, privatekey):
- return curve.decrypt(base64.b64decode(ciphertext), curve.wif_to_private(privatekey), derivation="sha512")
+ return curve.decrypt(base64.b64decode(ciphertext), curve.wif_to_private(privatekey.encode()), derivation="sha512")
def decodePubkey(pubkey):
diff --git a/plugins/CryptMessage/CryptMessagePlugin.py b/plugins/CryptMessage/CryptMessagePlugin.py
index 150bf8be..7c24f730 100644
--- a/plugins/CryptMessage/CryptMessagePlugin.py
+++ b/plugins/CryptMessage/CryptMessagePlugin.py
@@ -110,7 +110,7 @@ class UiWebsocketPlugin(object):
# Gets the publickey of a given privatekey
def actionEccPrivToPub(self, to, privatekey):
- self.response(to, curve.private_to_public(curve.wif_to_private(privatekey)))
+ self.response(to, curve.private_to_public(curve.wif_to_private(privatekey.encode())))
# Gets the address of a given publickey
def actionEccPubToAddr(self, to, publickey):
@@ -149,8 +149,8 @@ class UserPlugin(object):
index = param_index
if "encrypt_publickey_%s" % index not in site_data:
- privatekey = self.getEncryptPrivatekey(address, param_index)
- publickey = curve.private_to_public(curve.wif_to_private(privatekey))
+ privatekey = self.getEncryptPrivatekey(address, param_index).encode()
+ publickey = curve.private_to_public(curve.wif_to_private(privatekey) + b"\x01")
site_data["encrypt_publickey_%s" % index] = base64.b64encode(publickey).decode("utf8")
return site_data["encrypt_publickey_%s" % index]
diff --git a/plugins/MergerSite/MergerSitePlugin.py b/plugins/MergerSite/MergerSitePlugin.py
index d2c24398..2dccc6de 100644
--- a/plugins/MergerSite/MergerSitePlugin.py
+++ b/plugins/MergerSite/MergerSitePlugin.py
@@ -298,9 +298,6 @@ class SiteStoragePlugin(object):
# Also notice merger sites on a merged site file change
def onUpdated(self, inner_path, file=None):
- if inner_path == "content.json":
- site_manager.updateMergerSites()
-
super(SiteStoragePlugin, self).onUpdated(inner_path, file)
merged_type = merged_db.get(self.site.address)
@@ -397,6 +394,6 @@ class SiteManagerPlugin(object):
super(SiteManagerPlugin, self).load(*args, **kwags)
self.updateMergerSites()
- def save(self, *args, **kwags):
- super(SiteManagerPlugin, self).save(*args, **kwags)
+ def saveDelayed(self, *args, **kwags):
+ super(SiteManagerPlugin, self).saveDelayed(*args, **kwags)
self.updateMergerSites()
diff --git a/plugins/PeerDb/PeerDbPlugin.py b/plugins/PeerDb/PeerDbPlugin.py
index 2ce5e39f..a66b81cf 100644
--- a/plugins/PeerDb/PeerDbPlugin.py
+++ b/plugins/PeerDb/PeerDbPlugin.py
@@ -59,7 +59,7 @@ class ContentDbPlugin(object):
def iteratePeers(self, site):
site_id = self.site_ids.get(site.address)
- for key, peer in site.peers.items():
+ for key, peer in list(site.peers.items()):
address, port = key.rsplit(":", 1)
if peer.has_hashfield:
hashfield = sqlite3.Binary(peer.hashfield.tobytes())
diff --git a/plugins/Sidebar/SidebarPlugin.py b/plugins/Sidebar/SidebarPlugin.py
index e6087adf..4ecca75a 100644
--- a/plugins/Sidebar/SidebarPlugin.py
+++ b/plugins/Sidebar/SidebarPlugin.py
@@ -117,7 +117,7 @@ class UiWebsocketPlugin(object):
peer_ips = [peer.key for peer in site.getConnectablePeers(20, allow_private=False)]
peer_ips.sort(key=lambda peer_ip: ".onion:" in peer_ip)
copy_link = "http://127.0.0.1:43110/%s/?zeronet_peers=%s" % (
- site.content_manager.contents["content.json"].get("domain", site.address),
+ site.content_manager.contents.get("content.json", {}).get("domain", site.address),
",".join(peer_ips)
)
@@ -173,8 +173,10 @@ class UiWebsocketPlugin(object):
-
"""))
@@ -737,10 +739,35 @@ class UiWebsocketPlugin(object):
@flag.no_multiuser
def actionSiteSetOwned(self, to, owned):
if self.site.address == config.updatesite:
- return self.response(to, "You can't change the ownership of the updater site")
+ return {"error": "You can't change the ownership of the updater site"}
self.site.settings["own"] = bool(owned)
self.site.updateWebsocket(owned=owned)
+ return "ok"
+
+ @flag.admin
+ @flag.no_multiuser
+ def actionSiteRecoverPrivatekey(self, to):
+ from Crypt import CryptBitcoin
+
+ site_data = self.user.sites[self.site.address]
+ if site_data.get("privatekey"):
+ return {"error": "This site already has saved privated key"}
+
+ address_index = self.site.content_manager.contents.get("content.json", {}).get("address_index")
+ if not address_index:
+ return {"error": "No address_index in content.json"}
+
+ privatekey = CryptBitcoin.hdPrivatekey(self.user.master_seed, address_index)
+ privatekey_address = CryptBitcoin.privatekeyToAddress(privatekey)
+
+ if privatekey_address == self.site.address:
+ site_data["privatekey"] = privatekey
+ self.user.save()
+ self.site.updateWebsocket(recover_privatekey=True)
+ return "ok"
+ else:
+ return {"error": "Unable to deliver private key for this site from current user's master_seed"}
@flag.admin
@flag.no_multiuser
@@ -748,6 +775,7 @@ class UiWebsocketPlugin(object):
site_data = self.user.sites[self.site.address]
site_data["privatekey"] = privatekey
self.site.updateWebsocket(set_privatekey=bool(privatekey))
+ self.user.save()
return "ok"
diff --git a/plugins/Sidebar/media/Console.coffee b/plugins/Sidebar/media/Console.coffee
index 724ebb94..d5a83346 100644
--- a/plugins/Sidebar/media/Console.coffee
+++ b/plugins/Sidebar/media/Console.coffee
@@ -20,10 +20,10 @@ class Console extends Class
handleMessageWebsocket_original(message)
$(window).on "hashchange", =>
- if window.top.location.hash == "#ZeroNet:Console"
+ if window.top.location.hash.startsWith("#ZeroNet:Console")
@open()
- if window.top.location.hash == "#ZeroNet:Console"
+ if window.top.location.hash.startsWith("#ZeroNet:Console")
setTimeout (=> @open()), 10
createHtmltag: ->
@@ -58,10 +58,13 @@ class Console extends Class
@container.appendTo(document.body)
@tag = @container.find(".console")
for tab_type in @tab_types
- tab = $("", {href: "#", "data-filter": tab_type.filter}).text(tab_type.title)
+ tab = $("", {href: "#", "data-filter": tab_type.filter, "data-title": tab_type.title}).text(tab_type.title)
if tab_type.filter == @tab_active
tab.addClass("active")
tab.on("click", @handleTabClick)
+ if window.top.location.hash.endsWith(tab_type.title)
+ @log "Triggering click on", tab
+ tab.trigger("click")
@tabs.append(tab)
@container.on "mousedown touchend touchcancel", (e) =>
@@ -192,6 +195,7 @@ class Console extends Class
$("a", @tabs).removeClass("active")
elem.addClass("active")
@changeFilter(@tab_active)
+ window.top.location.hash = "#ZeroNet:Console:" + elem.data("title")
return false
window.Console = Console
diff --git a/plugins/Sidebar/media/Prototypes.coffee b/plugins/Sidebar/media/Prototypes.coffee
new file mode 100644
index 00000000..a9edd255
--- /dev/null
+++ b/plugins/Sidebar/media/Prototypes.coffee
@@ -0,0 +1,9 @@
+String::startsWith = (s) -> @[...s.length] is s
+String::endsWith = (s) -> s is '' or @[-s.length..] is s
+String::capitalize = -> if @.length then @[0].toUpperCase() + @.slice(1) else ""
+String::repeat = (count) -> new Array( count + 1 ).join(@)
+
+window.isEmpty = (obj) ->
+ for key of obj
+ return false
+ return true
diff --git a/plugins/Sidebar/media/Sidebar.coffee b/plugins/Sidebar/media/Sidebar.coffee
index 47c6e7f8..57d36eac 100644
--- a/plugins/Sidebar/media/Sidebar.coffee
+++ b/plugins/Sidebar/media/Sidebar.coffee
@@ -219,6 +219,9 @@ class Sidebar extends Class
@wrapper.notifications.add "privatekey", "done", "Saved private key removed", 5000
return false
+ # Use requested address for browse files urls
+ @tag.find("#browse-files").attr("href", document.location.pathname.replace(/(\/.*?(\/|$)).*$/, "/list$1"))
+
animDrag: (e) =>
@@ -346,6 +349,25 @@ class Sidebar extends Class
if res == "ok"
@wrapper.notifications.add "sign", "done", "#{inner_path} Signed and published!", 5000
+ handleSiteDeleteClick: ->
+ if @wrapper.site_info.privatekey
+ question = "Are you sure?
This site has a saved private key" + options = ["Forget private key and delete site"] + else + question = "Are you sure?" + options = ["Delete this site", "Blacklist"] + @wrapper.displayConfirm question, options, (confirmed) => + if confirmed == 1 + @tag.find("#button-delete").addClass("loading") + @wrapper.ws.cmd "siteDelete", @wrapper.site_info.address, -> + document.location = $(".fixbutton-bg").attr("href") + else if confirmed == 2 + @wrapper.displayPrompt "Blacklist this site", "text", "Delete and Blacklist", "Reason", (reason) => + @tag.find("#button-delete").addClass("loading") + @wrapper.ws.cmd "siteblockAdd", [@wrapper.site_info.address, reason] + @wrapper.ws.cmd "siteDelete", @wrapper.site_info.address, -> + document.location = $(".fixbutton-bg").attr("href") + onOpened: -> @log "Opened" @scrollable() @@ -417,26 +439,23 @@ class Sidebar extends Class # Delete site @tag.find("#button-delete").off("click touchend").on "click touchend", => - @wrapper.displayConfirm "Are you sure?", ["Delete this site", "Blacklist"], (confirmed) => - if confirmed == 1 - @tag.find("#button-delete").addClass("loading") - @wrapper.ws.cmd "siteDelete", @wrapper.site_info.address, -> - document.location = $(".fixbutton-bg").attr("href") - else if confirmed == 2 - @wrapper.displayPrompt "Blacklist this site", "text", "Delete and Blacklist", "Reason", (reason) => - @tag.find("#button-delete").addClass("loading") - @wrapper.ws.cmd "siteblockAdd", [@wrapper.site_info.address, reason] - @wrapper.ws.cmd "siteDelete", @wrapper.site_info.address, -> - document.location = $(".fixbutton-bg").attr("href") - - + @handleSiteDeleteClick() return false # Owned checkbox @tag.find("#checkbox-owned").off("click touchend").on "click touchend", => - @wrapper.ws.cmd "siteSetOwned", [@tag.find("#checkbox-owned").is(":checked")] + owned = @tag.find("#checkbox-owned").is(":checked") + @wrapper.ws.cmd "siteSetOwned", [owned], (res_set_owned) => + @log "Owned", owned + if owned + @wrapper.ws.cmd "siteRecoverPrivatekey", [], (res_recover) => + if res_recover == "ok" + @wrapper.notifications.add("recover", "done", "Private key recovered from master seed", 5000) + else + @log "Unable to recover private key: #{res_recover.error}" - # Owned checkbox + + # Owned auto download checkbox @tag.find("#checkbox-autodownloadoptional").off("click touchend").on "click touchend", => @wrapper.ws.cmd "siteSetAutodownloadoptional", [@tag.find("#checkbox-autodownloadoptional").is(":checked")] diff --git a/plugins/Sidebar/media/Sidebar.css b/plugins/Sidebar/media/Sidebar.css index cf56f061..8ce16ec7 100644 --- a/plugins/Sidebar/media/Sidebar.css +++ b/plugins/Sidebar/media/Sidebar.css @@ -16,9 +16,10 @@ .sidebar .link-right { color: white; text-decoration: none; border-bottom: 1px solid #666; text-transform: uppercase; } .sidebar .link-right:hover { border-color: #CCC; } .sidebar .link-right:active { background-color: #444 } +.sidebar .link-outline { outline: 1px solid #eee6; padding: 2px 13px; border-bottom: none; font-size: 80%; } /* SIDEBAR */ -.sidebar-container { width: 100%; height: 100%; overflow: hidden; position: fixed; } +.sidebar-container { width: 100%; height: 100%; overflow: hidden; position: fixed; top: 0px; z-index: 2;} .sidebar { background-color: #212121; position: fixed; backface-visibility: hidden; right: -1200px; height: 100%; width: 1200px; } /*box-shadow: inset 0px 0px 10px #000*/ .sidebar .content { margin: 30px; font-family: "Segoe UI Light", "Segoe UI", "Helvetica Neue"; color: white; width: 375px; height: 300px; font-weight: 200; transition: all 1s; opacity: 0 } .sidebar-container.loaded .content { opacity: 1; transform: none } diff --git a/plugins/Sidebar/media/all.css b/plugins/Sidebar/media/all.css index 4921d57f..056d7e89 100644 --- a/plugins/Sidebar/media/all.css +++ b/plugins/Sidebar/media/all.css @@ -128,9 +128,10 @@ .sidebar .link-right { color: white; text-decoration: none; border-bottom: 1px solid #666; text-transform: uppercase; } .sidebar .link-right:hover { border-color: #CCC; } .sidebar .link-right:active { background-color: #444 } +.sidebar .link-outline { outline: 1px solid #eee6; padding: 2px 13px; border-bottom: none; font-size: 80%; } /* SIDEBAR */ -.sidebar-container { width: 100%; height: 100%; overflow: hidden; position: fixed; } +.sidebar-container { width: 100%; height: 100%; overflow: hidden; position: fixed; top: 0px; z-index: 2;} .sidebar { background-color: #212121; position: fixed; -webkit-backface-visibility: hidden; -moz-backface-visibility: hidden; -o-backface-visibility: hidden; -ms-backface-visibility: hidden; backface-visibility: hidden ; right: -1200px; height: 100%; width: 1200px; } /*box-shadow: inset 0px 0px 10px #000*/ .sidebar .content { margin: 30px; font-family: "Segoe UI Light", "Segoe UI", "Helvetica Neue"; color: white; width: 375px; height: 300px; font-weight: 200; -webkit-transition: all 1s; -moz-transition: all 1s; -o-transition: all 1s; -ms-transition: all 1s; transition: all 1s ; opacity: 0 } .sidebar-container.loaded .content { opacity: 1; -webkit-transform: none ; -moz-transform: none ; -o-transform: none ; -ms-transform: none ; transform: none } diff --git a/plugins/Sidebar/media/all.js b/plugins/Sidebar/media/all.js index f83a5c5c..5a03a37c 100644 --- a/plugins/Sidebar/media/all.js +++ b/plugins/Sidebar/media/all.js @@ -55,7 +55,6 @@ }).call(this); - /* ---- Console.coffee ---- */ @@ -115,12 +114,12 @@ })(this); $(window).on("hashchange", (function(_this) { return function() { - if (window.top.location.hash === "#ZeroNet:Console") { + if (window.top.location.hash.startsWith("#ZeroNet:Console")) { return _this.open(); } }; })(this)); - if (window.top.location.hash === "#ZeroNet:Console") { + if (window.top.location.hash.startsWith("#ZeroNet:Console")) { setTimeout(((function(_this) { return function() { return _this.open(); @@ -152,12 +151,17 @@ tab_type = ref[j]; tab = $("", { href: "#", - "data-filter": tab_type.filter + "data-filter": tab_type.filter, + "data-title": tab_type.title }).text(tab_type.title); if (tab_type.filter === this.tab_active) { tab.addClass("active"); } tab.on("click", this.handleTabClick); + if (window.top.location.hash.endsWith(tab_type.title)) { + this.log("Triggering click on", tab); + tab.trigger("click"); + } this.tabs.append(tab); } this.container.on("mousedown touchend touchcancel", (function(_this) { @@ -343,6 +347,7 @@ $("a", this.tabs).removeClass("active"); elem.addClass("active"); this.changeFilter(this.tab_active); + window.top.location.hash = "#ZeroNet:Console:" + elem.data("title"); return false; }; @@ -354,7 +359,6 @@ }).call(this); - /* ---- Menu.coffee ---- */ @@ -437,6 +441,39 @@ }).call(this); +/* ---- Prototypes.coffee ---- */ + + +(function() { + String.prototype.startsWith = function(s) { + return this.slice(0, s.length) === s; + }; + + String.prototype.endsWith = function(s) { + return s === '' || this.slice(-s.length) === s; + }; + + String.prototype.capitalize = function() { + if (this.length) { + return this[0].toUpperCase() + this.slice(1); + } else { + return ""; + } + }; + + String.prototype.repeat = function(count) { + return new Array(count + 1).join(this); + }; + + window.isEmpty = function(obj) { + var key; + for (key in obj) { + return false; + } + return true; + }; + +}).call(this); /* ---- RateLimit.coffee ---- */ @@ -466,7 +503,6 @@ }).call(this); - /* ---- Scrollable.js ---- */ @@ -814,7 +850,7 @@ window.initScrollable = function () { return false; }; })(this)); - return this.tag.find("#privatekey-forget").off("click, touchend").on("click touchend", (function(_this) { + this.tag.find("#privatekey-forget").off("click, touchend").on("click touchend", (function(_this) { return function(e) { _this.wrapper.displayConfirm("Remove saved private key for this site?", "Forget", function(res) { if (!res) { @@ -827,6 +863,7 @@ window.initScrollable = function () { return false; }; })(this)); + return this.tag.find("#browse-files").attr("href", document.location.pathname.replace(/(\/.*?(\/|$)).*$/, "/list$1")); }; Sidebar.prototype.animDrag = function(e) { @@ -983,6 +1020,35 @@ window.initScrollable = function () { })(this)); }; + Sidebar.prototype.handleSiteDeleteClick = function() { + var options, question; + if (this.wrapper.site_info.privatekey) { + question = "Are you sure?
This site has a saved private key"; + options = ["Forget private key and delete site"]; + } else { + question = "Are you sure?"; + options = ["Delete this site", "Blacklist"]; + } + return this.wrapper.displayConfirm(question, options, (function(_this) { + return function(confirmed) { + if (confirmed === 1) { + _this.tag.find("#button-delete").addClass("loading"); + return _this.wrapper.ws.cmd("siteDelete", _this.wrapper.site_info.address, function() { + return document.location = $(".fixbutton-bg").attr("href"); + }); + } else if (confirmed === 2) { + return _this.wrapper.displayPrompt("Blacklist this site", "text", "Delete and Blacklist", "Reason", function(reason) { + _this.tag.find("#button-delete").addClass("loading"); + _this.wrapper.ws.cmd("siteblockAdd", [_this.wrapper.site_info.address, reason]); + return _this.wrapper.ws.cmd("siteDelete", _this.wrapper.site_info.address, function() { + return document.location = $(".fixbutton-bg").attr("href"); + }); + }); + } + }; + })(this)); + }; + Sidebar.prototype.onOpened = function() { var menu; this.log("Opened"); @@ -1073,28 +1139,26 @@ window.initScrollable = function () { })(this)); this.tag.find("#button-delete").off("click touchend").on("click touchend", (function(_this) { return function() { - _this.wrapper.displayConfirm("Are you sure?", ["Delete this site", "Blacklist"], function(confirmed) { - if (confirmed === 1) { - _this.tag.find("#button-delete").addClass("loading"); - return _this.wrapper.ws.cmd("siteDelete", _this.wrapper.site_info.address, function() { - return document.location = $(".fixbutton-bg").attr("href"); - }); - } else if (confirmed === 2) { - return _this.wrapper.displayPrompt("Blacklist this site", "text", "Delete and Blacklist", "Reason", function(reason) { - _this.tag.find("#button-delete").addClass("loading"); - _this.wrapper.ws.cmd("siteblockAdd", [_this.wrapper.site_info.address, reason]); - return _this.wrapper.ws.cmd("siteDelete", _this.wrapper.site_info.address, function() { - return document.location = $(".fixbutton-bg").attr("href"); - }); - }); - } - }); + _this.handleSiteDeleteClick(); return false; }; })(this)); this.tag.find("#checkbox-owned").off("click touchend").on("click touchend", (function(_this) { return function() { - return _this.wrapper.ws.cmd("siteSetOwned", [_this.tag.find("#checkbox-owned").is(":checked")]); + var owned; + owned = _this.tag.find("#checkbox-owned").is(":checked"); + return _this.wrapper.ws.cmd("siteSetOwned", [owned], function(res_set_owned) { + _this.log("Owned", owned); + if (owned) { + return _this.wrapper.ws.cmd("siteRecoverPrivatekey", [], function(res_recover) { + if (res_recover === "ok") { + return _this.wrapper.notifications.add("recover", "done", "Private key recovered from master seed", 5000); + } else { + return _this.log("Unable to recover private key: " + res_recover.error); + } + }); + } + }); }; })(this)); this.tag.find("#checkbox-autodownloadoptional").off("click touchend").on("click touchend", (function(_this) { diff --git a/plugins/Trayicon/lib/notificationicon.py b/plugins/Trayicon/lib/notificationicon.py index 57a4ddd6..8b913f83 100644 --- a/plugins/Trayicon/lib/notificationicon.py +++ b/plugins/Trayicon/lib/notificationicon.py @@ -566,10 +566,11 @@ class NotificationIcon(object): # print "NotificationIcon error", err, message message = MSG() time.sleep(0.125) - print("Icon thread stopped, removing icon...") + print("Icon thread stopped, removing icon (hicon: %s, hwnd: %s)..." % (self._hicon, self._hwnd)) Shell_NotifyIcon(NIM_DELETE, ctypes.cast(ctypes.pointer(iconinfo), ctypes.POINTER(NOTIFYICONDATA))) ctypes.windll.user32.DestroyWindow(self._hwnd) + ctypes.windll.user32.DestroyIcon.argtypes = [ctypes.wintypes.HICON] ctypes.windll.user32.DestroyIcon(self._hicon) diff --git a/plugins/UiConfig/media/js/ConfigStorage.coffee b/plugins/UiConfig/media/js/ConfigStorage.coffee index 9f35a91c..92327001 100644 --- a/plugins/UiConfig/media/js/ConfigStorage.coffee +++ b/plugins/UiConfig/media/js/ConfigStorage.coffee @@ -32,6 +32,13 @@ class ConfigStorage extends Class return value.split("\n") if type == "boolean" and not value return false + else if type == "number" + if typeof(value) == "number" + return value.toString() + else if not value + return "0" + else + return value else return value @@ -68,7 +75,7 @@ class ConfigStorage extends Class title: "File server port" type: "text" valid_pattern: /[0-9]*/ - description: "Other peers will use this port to reach your served sites. (default: 15441)" + description: "Other peers will use this port to reach your served sites. (default: randomize)" section.items.push key: "ip_external" @@ -111,7 +118,7 @@ class ConfigStorage extends Class key: "trackers_file" type: "textarea" description: "Load additional list of torrent trackers dynamically, from a file" - placeholder: "Eg.: data/trackers.json" + placeholder: "Eg.: {data_dir}/trackers.json" value_pos: "fullwidth" section.items.push diff --git a/plugins/UiConfig/media/js/UiConfig.coffee b/plugins/UiConfig/media/js/UiConfig.coffee index 4ee3a1c6..bc1ac697 100644 --- a/plugins/UiConfig/media/js/UiConfig.coffee +++ b/plugins/UiConfig/media/js/UiConfig.coffee @@ -57,9 +57,8 @@ class UiConfig extends ZeroFrame for item, i in changed_values last = i == changed_values.length - 1 value = @config_storage.deformatValue(item.value, typeof(@config[item.key].default)) - value_same_as_default = JSON.stringify(@config[item.key].default) == JSON.stringify(value) - if value_same_as_default - value = null + default_value = @config_storage.deformatValue(@config[item.key].default, typeof(@config[item.key].default)) + value_same_as_default = JSON.stringify(default_value) == JSON.stringify(value) if @config[item.key].item.valid_pattern and not @config[item.key].item.isHidden?() match = value.match(@config[item.key].item.valid_pattern) @@ -69,6 +68,9 @@ class UiConfig extends ZeroFrame cb(false) break + if value_same_as_default + value = null + @saveValue(item.key, value, if last then cb else null) saveValue: (key, value, cb) => diff --git a/plugins/UiConfig/media/js/all.js b/plugins/UiConfig/media/js/all.js index 43a91bc8..cb3b553f 100644 --- a/plugins/UiConfig/media/js/all.js +++ b/plugins/UiConfig/media/js/all.js @@ -1336,6 +1336,14 @@ } if (type === "boolean" && !value) { return false; + } else if (type === "number") { + if (typeof value === "number") { + return value.toString(); + } else if (!value) { + return "0"; + } else { + return value; + } } else { return value; } @@ -1379,7 +1387,7 @@ title: "File server port", type: "text", valid_pattern: /[0-9]*/, - description: "Other peers will use this port to reach your served sites. (default: 15441)" + description: "Other peers will use this port to reach your served sites. (default: randomize)" }); section.items.push({ key: "ip_external", @@ -1426,7 +1434,7 @@ key: "trackers_file", type: "textarea", description: "Load additional list of torrent trackers dynamically, from a file", - placeholder: "Eg.: data/trackers.json", + placeholder: "Eg.: {data_dir}/trackers.json", value_pos: "fullwidth" }); section.items.push({ @@ -1934,17 +1942,15 @@ }; UiConfig.prototype.saveValues = function(cb) { - var base, changed_values, i, item, j, last, len, match, message, results, value, value_same_as_default; + var base, changed_values, default_value, i, item, j, last, len, match, message, results, value, value_same_as_default; changed_values = this.getValuesChanged(); results = []; for (i = j = 0, len = changed_values.length; j < len; i = ++j) { item = changed_values[i]; last = i === changed_values.length - 1; value = this.config_storage.deformatValue(item.value, typeof this.config[item.key]["default"]); - value_same_as_default = JSON.stringify(this.config[item.key]["default"]) === JSON.stringify(value); - if (value_same_as_default) { - value = null; - } + default_value = this.config_storage.deformatValue(this.config[item.key]["default"], typeof this.config[item.key]["default"]); + value_same_as_default = JSON.stringify(default_value) === JSON.stringify(value); if (this.config[item.key].item.valid_pattern && !(typeof (base = this.config[item.key].item).isHidden === "function" ? base.isHidden() : void 0)) { match = value.match(this.config[item.key].item.valid_pattern); if (!match || match[0] !== value) { @@ -1954,6 +1960,9 @@ break; } } + if (value_same_as_default) { + value = null; + } results.push(this.saveValue(item.key, value, last ? cb : null)); } return results; @@ -2054,4 +2063,4 @@ window.Page.createProjector(); -}).call(this); \ No newline at end of file +}).call(this); diff --git a/plugins/UiFileManager/UiFileManagerPlugin.py b/plugins/UiFileManager/UiFileManagerPlugin.py new file mode 100644 index 00000000..0af5bea9 --- /dev/null +++ b/plugins/UiFileManager/UiFileManagerPlugin.py @@ -0,0 +1,84 @@ +import io +import os +import re +import urllib + +from Plugin import PluginManager +from Config import config +from Translate import Translate + +plugin_dir = os.path.dirname(__file__) + +if "_" not in locals(): + _ = Translate(plugin_dir + "/languages/") + + +@PluginManager.registerTo("UiRequest") +class UiFileManagerPlugin(object): + def actionWrapper(self, path, extra_headers=None): + match = re.match("/list/(.*?)(/.*|)$", path) + if not match: + return super().actionWrapper(path, extra_headers) + + if not extra_headers: + extra_headers = {} + + request_address, inner_path = match.groups() + + script_nonce = self.getScriptNonce() + + self.sendHeader(extra_headers=extra_headers, script_nonce=script_nonce) + + site = self.server.site_manager.need(request_address) + + if not site: + return super().actionWrapper(path, extra_headers) + + request_params = urllib.parse.urlencode( + {"address": site.address, "site": request_address, "inner_path": inner_path.strip("/")} + ) + + is_content_loaded = "content.json" in site.content_manager.contents + + return iter([super().renderWrapper( + site, path, "uimedia/plugins/uifilemanager/list.html?%s" % request_params, + "List", extra_headers, show_loadingscreen=not is_content_loaded, script_nonce=script_nonce + )]) + + def actionUiMedia(self, path, *args, **kwargs): + if path.startswith("/uimedia/plugins/uifilemanager/"): + file_path = path.replace("/uimedia/plugins/uifilemanager/", plugin_dir + "/media/") + if config.debug and (file_path.endswith("all.js") or file_path.endswith("all.css")): + # If debugging merge *.css to all.css and *.js to all.js + from Debug import DebugMedia + DebugMedia.merge(file_path) + + if file_path.endswith("js"): + data = _.translateData(open(file_path).read(), mode="js").encode("utf8") + elif file_path.endswith("html"): + if self.get.get("address"): + site = self.server.site_manager.need(self.get.get("address")) + if "content.json" not in site.content_manager.contents: + site.needFile("content.json") + data = _.translateData(open(file_path).read(), mode="html").encode("utf8") + else: + data = open(file_path, "rb").read() + + return self.actionFile(file_path, file_obj=io.BytesIO(data), file_size=len(data)) + else: + return super().actionUiMedia(path) + + def error404(self, path=""): + if not path.endswith("index.html") and not path.endswith("/"): + return super().error404(path) + + path_parts = self.parsePath(path) + site = self.server.site_manager.get(path_parts["request_address"]) + + if not site or not site.content_manager.contents.get("content.json"): + return super().error404(path) + + self.sendHeader(200) + path_redirect = "/list" + re.sub("^/media/", "/", path) + self.log.debug("Index.html not found: %s, redirecting to: %s" % (path, path_redirect)) + return self.formatRedirect(path_redirect) diff --git a/plugins/UiFileManager/__init__.py b/plugins/UiFileManager/__init__.py new file mode 100644 index 00000000..b6c2bd1a --- /dev/null +++ b/plugins/UiFileManager/__init__.py @@ -0,0 +1 @@ +from . import UiFileManagerPlugin diff --git a/plugins/UiFileManager/languages/hu.json b/plugins/UiFileManager/languages/hu.json new file mode 100644 index 00000000..5a915f9f --- /dev/null +++ b/plugins/UiFileManager/languages/hu.json @@ -0,0 +1,20 @@ +{ + "New file name:": "Új fájl neve:", + "Delete": "Törlés", + "Cancel": "Mégse", + "Selected:": "Köjelölt:", + "Delete and remove optional:": "Törlés és opcionális fájl eltávolÃtása", + " files": " fájl", + " (modified)": " (módostott)", + " (new)": " (új)", + " (optional)": " (opcionális)", + " (ignored from content.json)": " (content.json-ból kihagyott)", + "Total: ": "Összesen: ", + " dir, ": " könyvtár, ", + " file in ": " fájl, ", + "+ New": "+ Új", + "Edit": "MódosÃt", + "View": "Megnyit", + "Save": "Mentés", + "Save: done!": "Mentés: Kész!" +} \ No newline at end of file diff --git a/plugins/UiFileManager/media/codemirror/LICENSE b/plugins/UiFileManager/media/codemirror/LICENSE new file mode 100644 index 00000000..ff7db4b9 --- /dev/null +++ b/plugins/UiFileManager/media/codemirror/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (C) 2017 by Marijn Haverbeke