diff options
| author | fox <fox@fakecake.org> | 2026-06-19 13:51:42 +0300 |
|---|---|---|
| committer | fox <fox@fakecake.org> | 2026-06-19 13:51:42 +0300 |
| commit | 2f3d46d7f311d73d966dff680b58c3522c268de0 (patch) | |
| tree | ebaf177ad8bad25db0b440f08bb25dcef2c73bde | |
| parent | 8eb610074f829cdcbbac035340318601fa41af5c (diff) | |
| parent | cae23c5e14a0ed4d80e9edde351cb4066e3e350c (diff) | |
| download | the-epube-2f3d46d7f311d73d966dff680b58c3522c268de0.tar.gz the-epube-2f3d46d7f311d73d966dff680b58c3522c268de0.tar.xz | |
Merge branch 'dev' into 'master'
deal with some potential minor xss issues See merge request git/the-epube!62
| -rw-r--r-- | .editorconfig | 4 | ||||
| -rw-r--r-- | classes/Handler/DefineHandler.php | 4 | ||||
| -rw-r--r-- | classes/Handler/ListHandler.php | 2 | ||||
| -rw-r--r-- | index.html | 208 | ||||
| -rw-r--r-- | src/app.js | 31 | ||||
| -rw-r--r-- | src/reader.js | 10 |
6 files changed, 136 insertions, 123 deletions
diff --git a/.editorconfig b/.editorconfig index 97bd94d..b59de64 100644 --- a/.editorconfig +++ b/.editorconfig @@ -13,3 +13,7 @@ indent_size = 4 [*.ts] indent_style = space indent_size = 4 + +[*.html] +indent_style = space +indent_size = 4 diff --git a/classes/Handler/DefineHandler.php b/classes/Handler/DefineHandler.php index 7906adc..f15885f 100644 --- a/classes/Handler/DefineHandler.php +++ b/classes/Handler/DefineHandler.php @@ -46,7 +46,7 @@ class DefineHandler implements RequestHandlerInterface, AuthRequired $retParsed = $this->parseDictReply($dictReply); if (count($retParsed) > 0) { - array_push($result, "<strong>$word</strong>"); + array_push($result, "<strong>" . htmlspecialchars($word, ENT_QUOTES, 'UTF-8') . "</strong>"); $result = array_merge($result, $retParsed); break; } else { @@ -60,7 +60,7 @@ class DefineHandler implements RequestHandlerInterface, AuthRequired } if (count($result) == 0) { - array_push($result, "No results for: <b>$origWord</b>"); + array_push($result, "No results for: <b>" . htmlspecialchars($origWord, ENT_QUOTES, 'UTF-8') . "</b>"); } return (new Response())->withBody(json_encode(["result" => $result])); diff --git a/classes/Handler/ListHandler.php b/classes/Handler/ListHandler.php index e8a5916..6ecec7d 100644 --- a/classes/Handler/ListHandler.php +++ b/classes/Handler/ListHandler.php @@ -32,7 +32,7 @@ class ListHandler implements RequestHandlerInterface, AuthRequired $fav_ids = []; while ($line = $fav_sth->fetch()) { - array_push($fav_ids, $line["bookid"]); + array_push($fav_ids, (int) $line["bookid"]); } if (empty($fav_ids)) { diff --git a/index.html b/index.html index 04d7aab..9c7f5ce 100644 --- a/index.html +++ b/index.html @@ -1,83 +1,97 @@ <!DOCTYPE html> <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1.0"> - <link href="lib/bootstrap/v3/css/bootstrap.min.css" rel="stylesheet" media="screen"> - <link id="theme_css" href="lib/bootstrap/v3/css/theme-dark.min.css" rel="stylesheet" media="screen"> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - - <script src="dist/app-libs.min.js"></script> - <script src="dist/app.min.js"></script> - - <title>The Epube</title> - <link type="text/css" rel="stylesheet" media="screen" href="dist/app.min.css" /> - <link rel="shortcut icon" type="image/png" href="img/favicon.png" /> - <link rel="manifest" href="manifest.json"> - <meta name="mobile-web-app-capable" content="yes"> - <script type="text/javascript"> - 'use strict'; - - const App = new AppClass(); - - if ('serviceWorker' in navigator) { - navigator.serviceWorker - .register('worker.js') - .then(function() { - console.log("service worker registered"); - - $(document).ready(function() { - App.init(); - }); - }); - } else { - alert("Service worker support missing in browser (are you using plain HTTP?)."); - } - </script> +<meta name="viewport" content="width=device-width, initial-scale=1.0"> +<link href="lib/bootstrap/v3/css/bootstrap.min.css" rel="stylesheet" media="screen"> +<link id="theme_css" href="lib/bootstrap/v3/css/theme-dark.min.css" rel="stylesheet" media="screen"> +<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + +<script src="dist/app-libs.min.js"></script> +<script src="dist/app.min.js"></script> + +<title>The Epube</title> +<link type="text/css" rel="stylesheet" media="screen" href="dist/app.min.css" /> +<link rel="shortcut icon" type="image/png" href="img/favicon.png" /> +<link rel="manifest" href="manifest.json"> +<meta name="mobile-web-app-capable" content="yes"> +<script type="text/javascript"> + 'use strict'; + + const App = new AppClass(); + + if ('serviceWorker' in navigator) { + navigator.serviceWorker + .register('worker.js') + .then(function(registration) { + console.log("service worker registered", registration); + + setInterval(() => { + registration.update(); + console.log('checking for service worker updates...'); + }, 1000 * 60 * 60); // hourly + + navigator.serviceWorker.addEventListener('controllerchange', () => { + console.log('new service worker activated in background'); + + $(".update_link").fadeIn(); + }); + + $(document).ready(function() { + App.init(); + }); + }); + } else { + alert("Service worker support missing in browser (are you using plain HTTP?)."); + } +</script> </head> <body class="epube-index"> <div class="navbar navbar-default navbar-static-top"> <div class="container"> - <div class="navbar-header"> - <span class="navbar-brand"><a href="?" class="cosmetic_version">The Epube</a></span> - - <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#nav-collapse" aria-expanded="false"> - <span class="sr-only">Toggle navigation</span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - </button> - - </div> - - <div class="collapse navbar-collapse" id="nav-collapse"> - - <ul class="nav navbar-nav"> - <li class="index_all"><a href="index.html">All</a></li> - <li class="index_favorites"><a href="index.html?mode=favorites">Favorites</a></li> - <li><a href="offline.html">Local</a></li> - </ul> - - <form class="navbar-form navbar-right"> - <div class="input-group"> - <input type="text" name="query" class="form-control search_query" placeholder="Search for..." - value=""> - <input type="hidden" name="mode" value=""> - <span class="input-group-btn"> - <button type="submit" class="btn btn-default">Go</button> - </span> - </div> - </form> - - <ul class="nav navbar-nav navbar-right"> - <li><a href="#" class="download_all_link" title="Download all"> - <span class="glyphicon glyphicon-download-alt text-primary"></span> <span class='hidden-sm hidden-md hidden-lg'>Download all</span> - </a></li> - <li><a href="#" class="logout_link" title="Log out"> - <span class="glyphicon glyphicon-log-out"></span> <span class='hidden-sm hidden-md hidden-lg'>Log out</span> - </a></li> - </ul> - </div> +<div class="navbar-header"> + <span class="navbar-brand"><a href="?" class="cosmetic_version">The Epube</a></span> + + <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#nav-collapse" aria-expanded="false"> + <span class="sr-only">Toggle navigation</span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </button> + +</div> + +<div class="collapse navbar-collapse" id="nav-collapse"> + + <ul class="nav navbar-nav"> + <li class="index_all"><a href="index.html">All</a></li> + <li class="index_favorites"><a href="index.html?mode=favorites">Favorites</a></li> + <li><a href="offline.html">Local</a></li> + </ul> + + <form class="navbar-form navbar-right"> + <div class="input-group"> + <input type="text" name="query" class="form-control search_query" placeholder="Search for..." + value=""> + <input type="hidden" name="mode" value=""> + <span class="input-group-btn"> + <button type="submit" class="btn btn-default">Go</button> + </span> + </div> + </form> + + <ul class="nav navbar-nav navbar-right"> + <li><a href="#" class="download_all_link" title="Download all"> + <span class="glyphicon glyphicon-download-alt text-primary"></span> <span class='hidden-sm hidden-md hidden-lg'>Download all</span> + </a></li> + <li><a href="#" class="update_link" style="display : none" title="New version available"> + <span class="text-info glyphicon glyphicon-refresh"></span> <span class="hidden-sm hidden-md hidden-lg">New version available, click to update</span> + </a></li> + <li><a href="#" class="logout_link" title="Log out"> + <span class="glyphicon glyphicon-log-out"></span> <span class='hidden-sm hidden-md hidden-lg'>Log out</span> + </a></li> + </ul> +</div> </div> </div> @@ -87,31 +101,31 @@ <div class="container container-main"> <form class="form-inline separate-search" style="display : none"> - <div class="input-group"> - <input type="text" name="query" class="form-control" placeholder="Search for..." - value=""> - <input type="hidden" name="mode" value=""> - <span class="input-group-btn"> - <button type="submit" class="btn btn-default">Go</button> - </span> - </div> +<div class="input-group"> + <input type="text" name="query" class="form-control" placeholder="Search for..." + value=""> + <input type="hidden" name="mode" value=""> + <span class="input-group-btn"> + <button type="submit" class="btn btn-default">Go</button> + </span> +</div> </form> <div class="modal fade" id="summary-modal" tabindex="-1" role="dialog"> - <div class="modal-dialog" role="document"> - <div class="modal-content"> - <div class="modal-header"> - <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button> - <h4 class="modal-title">Summary</h4> - </div> - <div class="modal-body"> - <div class="book-summary"> </div> - </div> - <div class="modal-footer"> - <button type="button" class="btn btn-default" data-dismiss="modal">Close</button> - </div> - </div> - </div> +<div class="modal-dialog" role="document"> +<div class="modal-content"> + <div class="modal-header"> + <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button> + <h4 class="modal-title">Summary</h4> + </div> + <div class="modal-body"> + <div class="book-summary"> </div> + </div> + <div class="modal-footer"> + <button type="button" class="btn btn-default" data-dismiss="modal">Close</button> + </div> +</div> +</div> </div> <div style="display : none" class="alert alert-info dl-progress"></div> @@ -119,9 +133,9 @@ <div id="books_container" class="row display-flex"></div> <ul class="pager"> - <li class="previous disabled"><a href="#">← Previous</a></li> - <li class="pager-info"><span>Loading, please wait...</span></li> - <li class="next"><a href="#">→ Next</a></li> +<li class="previous disabled"><a href="#">← Previous</a></li> +<li class="pager-info"><span>Loading, please wait...</span></li> +<li class="next"><a href="#">→ Next</a></li> </ul> </div> diff --git a/src/app.js b/src/app.js index e72da4f..96c7a0e 100644 --- a/src/app.js +++ b/src/app.js @@ -140,6 +140,13 @@ class AppCommon { $("#theme_css").attr("href", "lib/bootstrap/v3/css/" + (is_night ? "theme-dark.min.css" : "bootstrap-theme.min.css")); } + + escapeHtml(str) { + if (!str) return ""; + const div = document.createElement("div"); + div.appendChild(document.createTextNode(str)); + return div.innerHTML; + } } /* eslint-disable-next-line no-unused-vars */ @@ -224,14 +231,8 @@ class AppClass extends AppCommon { this.populateList(); if ('serviceWorker' in navigator) { - navigator.serviceWorker.addEventListener('message', () => { - // Future: handle SW messages (e.g., update available notifications) - }); - this.showCovers(); this.updateOfflinePrompts(); - //this.refreshCache(); - } else { $(".container-main") .addClass("alert alert-danger") @@ -240,10 +241,6 @@ class AppClass extends AppCommon { } initCommonEventHandlers() { - /* $(".refresh_cache_link").on('click', () => { - this.refreshCache(true); - }); */ - $(".remove_all_downloads").on('click', () => { this.removeAll(); }); @@ -257,6 +254,11 @@ class AppClass extends AppCommon { this.getAll(); }); + $(".update_link").on('click', (e) => { + e.preventDefault(); + window.location.reload(); + }); + $(".cosmetic_version").attr('title', this.cosmeticVersion); } @@ -475,7 +477,7 @@ class AppClass extends AppCommon { $(".dl-progress") .show() - .html("Finished downloading <b>" + data.title + "</b>"); + .html("Finished downloading <b>" + this.escapeHtml(data.title) + "</b>"); window.clearTimeout(this._dl_progress_timeout); @@ -648,13 +650,6 @@ class AppClass extends AppCommon { pagerInfo.find("span").text(`Page ${currentPage} of ${totalPages}`); } - escapeHtml(str) { - if (!str) return ""; - const div = document.createElement("div"); - div.appendChild(document.createTextNode(str)); - return div.innerHTML; - } - /** * Render a book cell DOM element. * @param {BookInfo} book - Book data object. diff --git a/src/reader.js b/src/reader.js index 8f8e784..a45ce9c 100644 --- a/src/reader.js +++ b/src/reader.js @@ -242,7 +242,7 @@ class ReaderClass extends AppCommon { console.error(err); - $(".loading-message").html(`Unable to load book info.<br/><small>${err.responseText}</small>`); + $(".loading-message").html(`Unable to load book info.<br/><small>${this.escapeHtml(err.responseText)}</small>`); return; } } @@ -285,7 +285,7 @@ class ReaderClass extends AppCommon { fileReader.onerror = (e) => { console.log('filereader error', e); - $(".loading-message").html("Unable to open book.<br/><small>" + e + "</small>"); + $(".loading-message").html("Unable to open book.<br/><small>" + this.escapeHtml(String(e)) + "</small>"); }; fileReader.readAsArrayBuffer(book_data); @@ -298,7 +298,7 @@ class ReaderClass extends AppCommon { await this.book.open(book_data); } catch (e) { console.error(e); - $(".loading-message").html(`Unable to open book.<br/><small>${e instanceof Error ? e.message: e}</small>`); + $(".loading-message").html(`Unable to open book.<br/><small>${this.escapeHtml(e instanceof Error ? e.message : String(e))}</small>`); return; } @@ -1406,7 +1406,7 @@ class ReaderClass extends AppCommon { console.error(err); - $(".dict_result").html(`Network error while looking up word: ${err.responseText}.`); + $(".dict_result").html(`Network error while looking up word: ${this.escapeHtml(err.responseText)}.`); } } @@ -1443,7 +1443,7 @@ class ReaderClass extends AppCommon { const a = $("<a>") .attr('href', '#') - .html(`<b class='pull-right'>${this.book.locations.locationFromCfi(row.cfi)}</b>${row.excerpt}`) + .html(`<b class='pull-right'>${this.book.locations.locationFromCfi(row.cfi)}</b>${this.escapeHtml(row.excerpt)}`) .attr('data-cfi', row.cfi) .on('click', () => { this.book.rendition.display($(a).attr('data-cfi')); |
