From 96acbd3593c9ee2ae4d7384cc138220e16a70d03 Mon Sep 17 00:00:00 2001
From: ed <s@ocv.me>
Date: Sun, 13 Apr 2025 16:08:44 +0000
Subject: [PATCH] cleanup

* remove cpr bonk (deadcode)
* remove get_vpath (wasteful)
---
 copyparty/httpcli.py     |  5 -----
 copyparty/web/browser.js | 11 ++++++-----
 copyparty/web/up2k.js    |  2 +-
 copyparty/web/util.js    |  5 -----
 4 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/copyparty/httpcli.py b/copyparty/httpcli.py
index 92c98922..dd6ba832 100644
--- a/copyparty/httpcli.py
+++ b/copyparty/httpcli.py
@@ -1206,11 +1206,6 @@ class HttpCli(object):
                 else:
                     return self.tx_res(res_path)
 
-            if res_path != undot(res_path):
-                t = "malicious user; attempted path traversal; req(%r) vp(%r) => %r"
-                self.log(t % (self.req, "/" + self.vpath, res_path), 1)
-                self.cbonk(self.conn.hsrv.gmal, self.req, "trav", "path traversal")
-
             self.tx_404()
             return False
 
diff --git a/copyparty/web/browser.js b/copyparty/web/browser.js
index e9510474..5f9f082e 100644
--- a/copyparty/web/browser.js
+++ b/copyparty/web/browser.js
@@ -2555,7 +2555,7 @@ var mpl = (function () {
 		ebi('np_artist').textContent = np.artist || (fns.length > 1 ? fns[0] : '');
 		ebi('np_title').textContent = np.title || '';
 		ebi('np_dur').textContent = np['.dur'] || '';
-		ebi('np_url').textContent = get_vpath() + np.file.split('?')[0];
+		ebi('np_url').textContent = uricom_dec(get_evpath()) + np.file.split('?')[0];
 		if (!MOBILE && cover)
 			ebi('np_img').setAttribute('src', cover);
 		else
@@ -5972,7 +5972,8 @@ var showfile = (function () {
 	};
 
 	r.mktree = function () {
-		var html = ['<li class="bn">' + L.tv_lst + '<br />' + linksplit(get_vpath()).join('<span>/</span>') + '</li>'];
+		var crumbs = linksplit(get_evpath()).join('<span>/</span>'),
+			html = ['<li class="bn">' + L.tv_lst + '<br />' + crumbs + '</li>'];
 		for (var a = 0; a < r.files.length; a++) {
 			var file = r.files[a];
 			html.push('<li><a href="?doc=' +
@@ -7595,8 +7596,8 @@ var treectl = (function () {
 	};
 
 	function reload_tree() {
-		var cdir = r.nextdir || get_vpath(),
-			cevp = get_evpath(),
+		var cevp = get_evpath(),
+			cdir = r.nextdir || uricom_dec(cevp),
 			links = QSA('#treeul a+a'),
 			nowrap = QS('#tree.nowrap') && QS('#hovertree.on'),
 			act = null;
@@ -9781,7 +9782,7 @@ function wintitle(txt, noname) {
 	if (s_name && !noname)
 		txt = s_name + ' ' + txt;
 
-	txt += get_vpath().slice(1, -1).split('/').pop();
+	txt += uricom_dec(get_evpath()).slice(1, -1).split('/').pop();
 
 	document.title = txt;
 }
diff --git a/copyparty/web/up2k.js b/copyparty/web/up2k.js
index 599eda02..9a26088d 100644
--- a/copyparty/web/up2k.js
+++ b/copyparty/web/up2k.js
@@ -1415,7 +1415,7 @@ function up2k_init(subtle) {
         if (FIREFOX && good_files.length > 3000)
             msg.push(L.u_ff_many + "\n\n");
 
-        msg.push(L.u_asku.format(good_files.length, esc(get_vpath())) + '<ul>');
+        msg.push(L.u_asku.format(good_files.length, esc(uricom_dec(get_evpath()))) + '<ul>');
         for (var a = 0, aa = Math.min(20, good_files.length); a < aa; a++)
             msg.push('<li>' + esc(good_files[a][1]) + '</li>');
 
diff --git a/copyparty/web/util.js b/copyparty/web/util.js
index 81f972c3..389593b4 100644
--- a/copyparty/web/util.js
+++ b/copyparty/web/util.js
@@ -857,11 +857,6 @@ function get_evpath() {
 }
 
 
-function get_vpath() {
-    return uricom_dec(get_evpath());
-}
-
-
 function noq_href(el) {
     return el.getAttribute('href').split('?')[0];
 }