diff --git a/.devcontainer/postCreateCommand.sh b/.devcontainer/postCreateCommand.sh index a59fbfbf..67ee2279 100755 --- a/.devcontainer/postCreateCommand.sh +++ b/.devcontainer/postCreateCommand.sh @@ -8,8 +8,7 @@ ln -s ./conf.sample.php cfg/conf.php composer install --no-dev --optimize-autoloader # for PHP unit testing -# composer require google/cloud-storage -# composer install --optimize-autoloader +composer require --global google/cloud-storage sudo chmod a+x "$(pwd)" && sudo rm -rf /var/www/html && sudo ln -s "$(pwd)" /var/www/html diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 32ada5b6..f3a07b52 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -15,3 +15,10 @@ This PR fixes * [ ] * [ ] * [ ] + +## Disclosure + +* [x] I do have used an AI/LLM tool for the work in this PR. +* [ ] I have **not** used an AI/LLM tool for the work in this PR. + + diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md new file mode 100644 index 00000000..e004b740 --- /dev/null +++ b/.github/copilot-instructions.md @@ -0,0 +1,119 @@ +# Copilot Coding Agent Onboarding for PrivateBin + +## Repository Overview + +**PrivateBin** is a minimalist, open-source online pastebin where the server has zero knowledge of the pasted data. All data is encrypted/decrypted in the browser via 256-bit AES (Galois Counter Mode). The project is a refactored fork of ZeroBin focused on extensibility and additional features. + +- **Main Use Case:** Secure, ephemeral sharing of text/code, with encryption happening exclusively client-side. +- **Languages:** PHP (~48%), JavaScript (~35%), CSS (~17%), with some legacy browser support (see `legacy.js`). +- **Type:** Web application (pastebin), with both server (PHP) and client (JavaScript) components. + +## Build & Validation Instructions + +### Prerequisites + +- **PHP:** 7.4+ (recommended: latest stable 7.x or 8.x) +- **Composer:** For dependency management (`composer install`) +- **Node.js & npm:** Only required for running JavaScript unit tests. **Main JS logic must remain browser-compatible!** +- **Recommended Environment:** Unix-like OS (Linux, macOS) with Apache or Nginx for full demo. + +### Bootstrap & Install + +1. **Clone the repository** and enter its root directory. +2. **Install PHP dependencies:** + ```sh + composer require --global google/cloud-storage phpunit/phpunit + ``` + - Always run this before building or testing PHP code. + - If you receive permission errors, verify `vendor/` is writable. + +3. **Install JS dependencies (for test only):** + ```sh + cd ./js + npm install + ``` + - Only required for running JS tests. Not needed for building or running the app. + +### Build + +- **No explicit build step** for PHP. The web app is served directly from source. + - This means **composer directory** need to be comitted (_except_ of big optional dependences like Google Cloud like GCS support or similar!) +- **For JavaScript:** There is no webpack/bundler step for release; browser JS is written in compatible ES6+ syntax, except in `legacy.js` (which must be designed to run cleanly even on ancient IE4 or Netscape to display the error message that a browser upgrade is necessary). We are trying to avoid jQuery in any new code and would like to eventually drop use of jQuery. We are considering modularizing the JS logic, but need to ensure to do so in a way that will work both in the browser as well as for node JS driven unit tests. + +### Run + +- **PHP Server Mode:** Use Apache/Nginx with PHP, pointing the web root to the repo root. +- **Demo:** Open the root directory served by the web server in a browser. This should call the index.php in the repositories root directory. + +### Test + +- **PHP Unit Tests:** + ```sh + vendor/bin/phpunit + ``` + - Always run after code changes to backend logic. + - If `vendor/bin/phpunit` does not exist, ensure `composer install` completed without errors. + + ```sh + cd ./js + npm run test + ``` + - Runs Mocha-based tests in Node.js context. Tests are implemented in BDD-Style or using jsVerify fixtures for property-based tests. + - Note: **Production JS must not use Node-only APIs.** Test code may use Node.js features, but main JS logic must remain browser-compatible. + - If you encounter `ReferenceError` for browser features, ensure only test code uses Node.js APIs. + +### Lint + +- **PHP:** Run (if `phpcs.xml` or similar config exists): + ```sh + vendor/bin/phpcs + ``` +- **JavaScript:** If `eslint` is present: + ```sh + npm run lint + ``` + - Check for configuration in `.eslintrc.*` files. + +### Validation / CI + +- **GitHub Actions:** CI runs `composer install`, `phpunit`, and `mocha` tests on PRs and pushes, as well as external tools such as style checkers and linters. +- **Pre-commit:** Always run both PHP and JS tests before submitting PRs. Fix any warnings or errors. + +## Project Layout & Structure + +- **Root files:** + - `README.md`: Project overview ([view full](../README.md)). + - `composer.json`, `composer.lock`: PHP dependencies. + - `.github/workflows/`: CI configuration. + - `cfg/`: Default configuration files. + - `js/`: Main client logic (browser JS), including: + - `package.json`: JS test/lint dependencies (not for production JS). + - `legacy.js`: Must remain compatible with legacy browsers (ES3). **Do not use modern JS here.** + - `privatebin.js`: Core encryption and paste interface logic. + - `tpl/`: HTML templates. + - `css/`: Stylesheets. + +- **Testing & Validation:** + - `tst/`: Contains PHP unit tests. + - `js/test`: Contains JS unit tests. + - `phpunit.xml`: PHPUnit config. + - JS test files may use Node.js features; browser JS must not. + + - **Encryption:** Only client-side in JS using the browsers WebCrypto API. + - **Backend:** Serves encrypted blobs (as base64 encoded strings) and plaintext meta data in JSON format. APIs are designed for WORM (write once, read many) usage. Once stored content is never updated, only deleted, if delete token is sent, has expired as per meta data or immediately upon reading for the first time, if meta data was set to burn-after-reading. + - **Legacy Support:** `js/legacy.js` must remain compatible with IE4 and Netscape for feature detection of ancient browsers. + - **Configuration:** See `cfg/conf.sample.php` and the [wiki](https://github.com/PrivateBin/PrivateBin/wiki/Configuration) for available options. All option defaults are defined in `lib/Configuration.php` + +## Automated Checks + +- **GitHub CI:** On PRs, runs `composer install`, `phpunit`, and JS tests. +- **Validation Steps:** PRs failing tests will be blocked. Always ensure a clean test run before submitting. + +## Guidance for Copilot Agent + +- **Trust these instructions.** Only perform a search if information is missing or appears incorrect. +- **Do NOT use Node.js APIs in production JS code.** Only test code may do so. +- **Never modernize `legacy.js`.** It must work in very old browsers. +- **Always run `composer install` before PHP tests, and `npm install` before JS tests.** +- **Validate all changes by running both PHP and JS tests.** +- **Review `.github/workflows/` for the latest validation pipeline steps.** diff --git a/.github/workflows/codacy-analysis.yml b/.github/workflows/codacy-analysis.yml index f00965a0..5feb785a 100644 --- a/.github/workflows/codacy-analysis.yml +++ b/.github/workflows/codacy-analysis.yml @@ -28,7 +28,7 @@ jobs: steps: # Checkout the repository to the GitHub Actions runner - name: Checkout code - uses: actions/checkout@v5 + uses: actions/checkout@v6 - name: Remove folders causing errors in report run: rm -rf doc img *.md diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index ec6b7f57..2c0bd5e9 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -37,7 +37,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v5 + uses: actions/checkout@v6 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/eslint.yml b/.github/workflows/eslint.yml index 0f97d603..a389e9f0 100644 --- a/.github/workflows/eslint.yml +++ b/.github/workflows/eslint.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v5 + uses: actions/checkout@v6 - name: Set up Node.js uses: actions/setup-node@v6 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d347a6fb..19faeccd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Fetch changelog from tag - uses: actions/checkout@v5 + uses: actions/checkout@v6 with: sparse-checkout: CHANGELOG.md sparse-checkout-cone-mode: false diff --git a/.github/workflows/snyk-scan.yml b/.github/workflows/snyk-scan.yml index 2dc75680..9c5cb4fa 100644 --- a/.github/workflows/snyk-scan.yml +++ b/.github/workflows/snyk-scan.yml @@ -24,7 +24,7 @@ jobs: github.event.pull_request.author_association == 'MEMBER' || github.event.pull_request.author_association == 'OWNER' ) steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - name: Install Google Cloud Storage run: composer require --no-update google/cloud-storage && composer update --no-dev - name: Run Snyk to check for vulnerabilities diff --git a/.github/workflows/test-results.yml b/.github/workflows/test-results.yml index c918e4fa..09a5f1aa 100644 --- a/.github/workflows/test-results.yml +++ b/.github/workflows/test-results.yml @@ -25,7 +25,7 @@ jobs: steps: - name: Download and Extract Artifacts - uses: dawidd6/action-download-artifact@ac66b43f0e6a346234dd65d4d0c8fbb31cb316e5 + uses: dawidd6/action-download-artifact@0bd50d53a6d7fb5cb921e607957e9cc12b4ce392 with: run_id: ${{ github.event.workflow_run.id }} path: artifacts diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4f7a3c92..e89fb4e4 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v5 + uses: actions/checkout@v6 - name: Validate composer.json and composer.lock run: composer validate - name: Install dependencies @@ -27,11 +27,11 @@ jobs: continue-on-error: "${{ matrix.experimental }}" strategy: matrix: - php-versions: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4'] + php-versions: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5'] experimental: [false] # uncomment this to start testing on development release # include: -# - php-versions: '8.5' # development release, things can break +# - php-versions: '8.6' # development release, things can break # experimental: true env: extensions: gd, sqlite3 @@ -41,7 +41,7 @@ jobs: # let's get started! - name: Checkout - uses: actions/checkout@v5 + uses: actions/checkout@v6 # cache PHP extensions - name: Setup cache environment @@ -53,7 +53,7 @@ jobs: key: ${{ runner.os }}-${{ env.extensions-cache-key }} - name: Cache extensions - uses: actions/cache@v4 + uses: actions/cache@v5 with: path: ${{ steps.extcache.outputs.dir }} key: ${{ steps.extcache.outputs.key }} @@ -89,7 +89,7 @@ jobs: shell: bash - name: Cache dependencies - uses: actions/cache@v4 + uses: actions/cache@v5 with: path: "${{ steps.composer-cache.outputs.dir }}" key: "${{ runner.os }}-composer-${{ steps.get-date.outputs.date }}-${{ hashFiles('**/composer.json') }}" @@ -112,7 +112,7 @@ jobs: - name: Upload Test Results if: always() - uses: actions/upload-artifact@v5 + uses: actions/upload-artifact@v6 with: name: Test Results (PHP ${{ matrix.php-versions }}) path: tst/results.xml @@ -129,7 +129,7 @@ jobs: # let's get started! - name: Checkout - uses: actions/checkout@v5 + uses: actions/checkout@v6 # cache PHP extensions - name: Setup cache environment @@ -141,7 +141,7 @@ jobs: key: ${{ runner.os }}-${{ env.extensions-cache-key }} - name: Cache extensions - uses: actions/cache@v4 + uses: actions/cache@v5 with: path: ${{ steps.extcache.outputs.dir }} key: ${{ steps.extcache.outputs.key }} @@ -177,7 +177,7 @@ jobs: shell: bash - name: Cache dependencies - uses: actions/cache@v4 + uses: actions/cache@v5 with: path: "${{ steps.composer-cache.outputs.dir }}" key: "${{ runner.os }}-composer-${{ steps.get-date.outputs.date }}-${{ hashFiles('**/composer.json') }}" @@ -203,7 +203,7 @@ jobs: - name: Upload Test Results if: always() - uses: actions/upload-artifact@v5 + uses: actions/upload-artifact@v6 with: name: Test Results path: tst/results.xml @@ -213,7 +213,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v5 + uses: actions/checkout@v6 - name: Setup Node uses: actions/setup-node@v6 @@ -235,7 +235,7 @@ jobs: - name: Upload Test Results if: always() - uses: actions/upload-artifact@v5 + uses: actions/upload-artifact@v6 with: name: Test Results (Mocha) path: js/mocha-results.xml @@ -245,7 +245,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Upload - uses: actions/upload-artifact@v5 + uses: actions/upload-artifact@v6 with: name: Event File path: "${{ github.event_path }}" diff --git a/CHANGELOG.md b/CHANGELOG.md index 6897e35d..d4b61755 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,32 @@ # PrivateBin version history +## 2.0.4 (not yet released) +* ADDED: Translations for Swedish +* CHANGED: Deduplicate JSON error message translations +* CHANGED: Refactored translation of exception messages +* FIXED: Some exceptions not getting translated +* FIXED: Attachment disappears after a "paste" in the message area (#1731) +* FIXED: The content format is not reset when creating a new document (#1707) + +## 1.7.9 (2025-11-13) +* CHANGED: Upgrading libraries to: base-x 5.0.1, bootstrap 5.3.8, DOMpurify 3.2.7, ip-lib 1.21.0 & kjua 0.10.0 +* CHANGED: Refactored jQuery DOM element creation into plain JavaScript +* FIXED: Prevent arbitrary PHP file inclusion when enabling template switching ([CVE-2025-64714](https://privatebin.info/reports/vulnerability-2025-11-12-templates.html)) +* FIXED: Malicious filename can be used for self-XSS / HTML injection locally for users ([CVE-2025-64711](https://privatebin.info/reports/vulnerability-2025-11-12-drag-drop.html)) +* FIXED: Sanitize file name in attachment size hint ([CVE-2025-62796](https://privatebin.info/reports/vulnerability-2025-10-28.html)) +* FIXED: Unable to create a new paste from the cloned one when a JSON file attached (#1585) +* FIXED: traffic limiter not working when using Filesystem storage and PHP opcache +* FIXED: Configuration combinations test errors + +## 2.0.3 (2025-11-12) +* FIXED: Prevent arbitrary PHP file inclusion when enabling template switching ([CVE-2025-64714](https://privatebin.info/reports/vulnerability-2025-11-12-templates.html)) +* FIXED: Malicious filename can be used for self-XSS / HTML injection locally for users ([CVE-2025-64711](https://privatebin.info/reports/vulnerability-2025-11-12-drag-drop.html)) +* FIXED: Unable to create a new paste from the cloned one when a JSON file attached (#1585) + ## 2.0.2 (2025-10-28) * CHANGED: Upgrading libraries to: DOMpurify 3.3.0 * CHANGED: Refactored jQuery DOM element creation into plain JavaScript -* FIXED: Sanitize file name in attachment size hint +* FIXED: Sanitize file name in attachment size hint ([CVE-2025-62796](https://privatebin.info/reports/vulnerability-2025-10-28.html)) * FIXED: PHP OPcache module is optional again (#1679) * FIXED: bootstrap template password peek input group display @@ -42,7 +65,7 @@ * FIXED: Page template scripts loading order (#1579) ## 1.7.7 (2025-06-28) -* ADDED: Switching templates using the web ui (#1501) +* ADDED: Switching templates using the web UI (#1501) * ADDED: Show file name and size on download page (#603) * CHANGED: Passing large data structures by reference to reduce memory consumption (#858) * CHANGED: Removed use of ctype functions and polyfill library for ctype @@ -80,7 +103,7 @@ * FIXED: Reset password input field on creation of new paste (#1194) * FIXED: Allow database schema upgrade to skip versions (#1343) * FIXED: `bootstrap5` dark mode toggle unset on dark browser preference (#1340) -* FIXED: Prevent bypassing YOURLS proxy URL filter, allowing to shorten non-self URLs +* FIXED: Prevent bypassing YOURLS proxy URL filter, allowing to shorten non-self URLs ([CVE-2024-39899](https://privatebin.info/reports/vulnerability-2024-07-09.html)) ## 1.7.3 (2024-05-13) * CHANGED: Various tweaks of the `bootstrap5` template, suggested by the community @@ -160,7 +183,7 @@ * ADDED: Oracle database support (#868) * ADDED: Configuration option to limit paste creation and commenting to certain IPs (#883) * ADDED: Set CSP also as meta tag, to deal with misconfigured webservers mangling the HTTP header -* ADDED: Sanitize SVG preview, preventing script execution in instance context +* ADDED: Sanitize SVG preview, preventing script execution in instance context ([CVE-2022-24833](https://privatebin.info/reports/vulnerability-2022-04-09.html)) * CHANGED: Language selection cookie only transmitted over HTTPS (#472) * CHANGED: Upgrading libraries to: base-x 4.0.0, bootstrap 3.4.1 (JS), DOMpurify 2.3.6, ip-lib 1.18.0, jQuery 3.6.0, random_compat 2.0.21, Showdown 2.0.3 & zlib 1.2.12 * CHANGED: Removed automatic `.ini` configuration file migration (#808) @@ -212,12 +235,12 @@ * ADDED: Option to send a mail with the link, when creating a paste (#398) * ADDED: Add support for CONFIG_PATH environment variable (#552) * CHANGED: Upgrading libraries to: base-x 3.0.7, DOMpurify 2.0.7 & Showdown 1.9.1 -* FIXED: HTML injection via unescaped attachment filename (#554) +* FIXED: HTML injection via unescaped attachment filename (#554) ([CVE-2020-5223](https://privatebin.info/reports/vulnerability-2020-01-11.html)) * FIXED: Password disabling option (#527) ## 1.2.2 (2020-01-11) * CHANGED: Upgrading libraries to: bootstrap 3.4.1 (CSS), DOMpurify 2.0.7, jQuery 3.4.1, kjua 0.6.0, Showdown 1.9.1 & SJCL 1.0.8 -* FIXED: HTML injection via unescaped attachment filename (#554) +* FIXED: HTML injection via unescaped attachment filename (#554) ([CVE-2020-5223](https://privatebin.info/reports/vulnerability-2020-01-11.html)) ## 1.3.1 (2019-09-22) * ADDED: Translation for Bulgarian (#455) @@ -261,7 +284,7 @@ * CHANGED: Added some missing Russian translations (#348) * CHANGED: Minor PHP refactoring: Rename PrivateBin class to Controller, improved logic of some persistence classes (#342) * CHANGED: Upgrading DOMpurify library to 1.0.7 -* FIXED: Ensure legacy browsers without webcrypto support can't create paste keys with insufficient entropy (#346) +* FIXED: Ensure legacy browsers without webcrypto support can't create paste keys with [insufficient entropy](https://privatebin.info/reports/vulnerability-2018-08-11.html) (#346) * FIXED: Re-add support for old browsers (Firefox<21, Chrome<31, Safari<7, IE<11), broken in 1.2, will be removed again in 1.3 ## 1.2 (2018-07-22) @@ -280,7 +303,7 @@ * FIXED: To counteract regressions introduced by the refactoring, we finally introduced property based unit testing for the JavaScript code, this caught several regressions, but also some very old bugs not found so far (#32) ## 1.1.1 (2017-10-06) -* CHANGED: Switched to `.php` file extension for configuration file, to avoid leaking configuration data in unprotected installation. +* CHANGED: Switched to `.php` file extension for configuration file, to avoid [leaking configuration data](https://privatebin.info/reports/vulnerability-2017-09-29.html) in unprotected installation. ## 1.1 (2016-12-26) * ADDED: Translations for Italian and Russian @@ -321,7 +344,7 @@ * FIXED: Removed unused code detected with the help of various code review tools * FIXED: Table format for PostgreSQL, making it possible to use PostgreSQL as backend in addition to MySQL, SQLite and flat files -## 0.22 (2015-11-09): +## 0.22 (2015-11-09) * ADDED: Tab character input support * ADDED: Dark bootstrap theme * ADDED: Option to hide clone button on expiring pastes @@ -337,13 +360,13 @@ * CHANGED: Database structure to store attachments, allowing larger attachments to be stored (depending on maximum BLOB size of database backend) * CHANGED: Refactored data model, traffic limiting & request handling -## 0.21.1 (2015-09-21): +## 0.21.1 (2015-09-21) * FIXING: lost meta data when using DB model instead of flat files * FIXING: mobile navbar getting triggered on load * CHANGED: database table "paste" gets automatically extended with a "meta" column * CHANGED: navbar of "bootstrap" template now spans full width of view port on large screens -## 0.21 (2015-09-19): +## 0.21 (2015-09-19) * ADDED: Translations for German, French and Polish, language selection menu (optional) * ADDED: File upload and image display support (optional) * ADDED: Markdown format support @@ -361,7 +384,7 @@ encryption), i18n (translation, counterpart of i18n.php) and helper (stateless u * [Translation](https://github.com/PrivateBin/PrivateBin/wiki/Translation) * [Templates](https://github.com/PrivateBin/PrivateBin/wiki/Templates) -## 0.20 (2015-09-03): +## 0.20 (2015-09-03) * ADDED: Password protected pastes (optional) * ADDED: configuration options for highlighting, password, discussions, expiration times, rate limiting * ADDED: JSON-only retrieval of paste incl. discussion, used to be able to refresh paste when posting a comment @@ -372,11 +395,11 @@ encryption), i18n (translation, counterpart of i18n.php) and helper (stateless u * updated JS libraries: jquery to 1.11.3, sjcl to 1.0.2, base64.js to 2.1.9, deflate to 0.5, inflate to 0.3 and prettify to latest * generally improved documentation, both inline phpdoc / JSdoc source code documentation, as well as Wiki pages on installation, configuration, development and JSON-API -## Alpha 0.19 (2013-07-05): +## Alpha 0.19 (2013-07-05) * Corrected XSS security flaw which affected IE<10. Other browsers were not affected. * Corrected spacing display in IE<10. -## Alpha 0.18 (2013-02-24): +## Alpha 0.18 (2013-02-24) * ADDED: The resulting URL is automatically selected after pressing "Send". You just have to press CTRL+C. * ADDED: Automatic syntax highlighting for 53 languages using highlight.js * ADDED: "5 minutes" and "1 week" expirations. @@ -390,32 +413,32 @@ encryption), i18n (translation, counterpart of i18n.php) and helper (stateless u * ADDED: Added version to js/css assets URLs in order to prevent some abusive caches to serve an obsolete version of these files when ZeroBin is upgraded. * "Burn after reading" option has been moved out of Expiration combo to a separate checkbox. Reason is: You can prevent a read-once paste to be available ad vitam eternam on the net. -## Alpha 0.17 (2013-02-23): +## Alpha 0.17 (2013-02-23) * ADDED: Deletion URL. * small refactoring. * improved regex checks. * larger server alt on installation. -## Alpha 0.16: +## Alpha 0.16 * FIXED minor php warnings. * FIXED: zerobin.js reformated and properly commented. * FIXED: Directory structure re-organized. * CHANGED: URL shortening button was removed. (It was bad for privacy.) -## Alpha 0.15 (2012-04-20): +## Alpha 0.15 (2012-04-20) * FIXED: 2 minor corrections to avoid notices in php log. * FIXED: Sources converted to UTF-8. -## Alpha 0.14 (2012-04-20): +## Alpha 0.14 (2012-04-20) * ADDED: GD presence is checked. * CHANGED: Traffic limiter data files moved to data/ (→easier rights management) * ADDED: "Burn after reading" implemented. Opening the URL will display the paste and immediately destroy it on server. -## Alpha 0.13 (2012-04-18): +## Alpha 0.13 (2012-04-18) * FIXED: ''imageantialias()'' call removed because it's not really usefull and can be a problem on most hosts (if GD is not compiled in php). * FIXED: $error not properly initialized in index.php -## Alpha 0.12 (2012-04-18): +## Alpha 0.12 (2012-04-18) ## DISCUSSIONS ! Now you can enable discussions on your pastes. Of course, posted comments and nickname are also encrypted and the server cannot see them. * This feature implies a change in storage format. You will have to delete all previous pastes in your ZeroBin. * Added [[php:vizhash_gd|Vizhash]] as avatars, so you can match posters IP addresses without revealing them. (Same image = same IP). Of course the IP address cannot be deduced from the Vizhash. @@ -423,17 +446,17 @@ encryption), i18n (translation, counterpart of i18n.php) and helper (stateless u * Explicit tags were added to CSS and jQuery selectors (eg. div#aaa instead of #aaa) to speed up browser. * Better cleaning of the URL (to make sure the key is not broken by some stupid redirection service) -## Alpha 0.11 (2012-04-12): +## Alpha 0.11 (2012-04-12) * Automatically ignore parameters (such as &utm_source=...) added //after// the anchor by some stupid Web 2.0 services. * First public release. -## Alpha 0.10 (2012-04-12): +## Alpha 0.10 (2012-04-12) * IE9 does not seem to correctly support ''pre-wrap'' either. Special handling mode activated for all version of IE<10. (Note: ALL other browsers correctly support this feature.) -## Alpha 0.9 (2012-04-11): +## Alpha 0.9 (2012-04-11) * Oh bummer... IE 8 is as shitty as IE6/7: Its does not seem to support ''white-space:pre-wrap'' correctly. I had to activate the special handling mode. I still have to test IE 9. -## Alpha 0.8 (2012-04-11): +## Alpha 0.8 (2012-04-11) * Source code not published yet. * Interface completely redesigned. Icons added. * Now properly supports IE6/7 (ugly display, but it works. "Clone" button is disabled though.) diff --git a/CREDITS.md b/CREDITS.md index dd6729bd..d4c35485 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -69,3 +69,4 @@ * Nicolas Le Gall - Japanese * lazerns - Arabic * Edward205 - Romanian +* babiloof - Swedish diff --git a/Makefile b/Makefile index 1384fd78..86165d7c 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ .PHONY: all coverage coverage-js coverage-php doc doc-js doc-php increment sign test test-js test-php help -CURRENT_VERSION = 2.0.2 -VERSION ?= 2.0.2 +CURRENT_VERSION = 2.0.3 +VERSION ?= 2.0.4 VERSION_FILES = README.md SECURITY.md doc/Installation.md js/package.json lib/Controller.php Makefile REGEX_CURRENT_VERSION := $(shell echo $(CURRENT_VERSION) | sed "s/\./\\\./g") REGEX_VERSION := $(shell echo $(VERSION) | sed "s/\./\\\./g") diff --git a/README.md b/README.md index e3bf3346..9ea3adf4 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # [![PrivateBin](https://cdn.rawgit.com/PrivateBin/assets/master/images/preview/logoSmall.png)](https://privatebin.info/) -*Current version: 2.0.2* +*Current version: 2.0.3* **PrivateBin** is a minimalist, open source online [pastebin](https://en.wikipedia.org/wiki/Pastebin) diff --git a/SECURITY.md b/SECURITY.md index 9e05fa43..5b37c50d 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -4,8 +4,8 @@ | Version | Supported | | ------- | ------------------ | -| 2.0.2 | :heavy_check_mark: | -| < 2.0.2 | :x: | +| 2.0.3 | :heavy_check_mark: | +| < 2.0.3 | :x: | ## Reporting a Vulnerability diff --git a/cfg/conf.sample.php b/cfg/conf.sample.php index 8fb5288b..b2456a4e 100644 --- a/cfg/conf.sample.php +++ b/cfg/conf.sample.php @@ -280,7 +280,7 @@ dir = PATH "data" ; "urlshortener" needs to point to the base URL of your PrivateBin ; instance with "?shortenviashlink&link=" appended. For example: ; urlshortener = "${basepath}?shortenviashlink&link=" -; This URL will in turn call YOURLS on the server side, using the URL from +; This URL will in turn call Shlink on the server side, using the URL from ; "apiurl" and the API Key from the "apikey" parameters below. ; apiurl = "https://shlink.example.com/rest/v3/short-urls" ; apikey = "your_api_key" diff --git a/composer.lock b/composer.lock index dac377f9..a7a66ba0 100644 --- a/composer.lock +++ b/composer.lock @@ -397,16 +397,16 @@ }, { "name": "nikic/php-parser", - "version": "v5.6.1", + "version": "v5.6.2", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2" + "reference": "3a454ca033b9e06b63282ce19562e892747449bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2", - "reference": "f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/3a454ca033b9e06b63282ce19562e892747449bb", + "reference": "3a454ca033b9e06b63282ce19562e892747449bb", "shasum": "" }, "require": { @@ -449,9 +449,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v5.6.1" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.6.2" }, - "time": "2025-08-13T20:13:15+00:00" + "time": "2025-10-21T19:32:17+00:00" }, { "name": "phar-io/manifest", @@ -2014,16 +2014,16 @@ }, { "name": "theseer/tokenizer", - "version": "1.2.3", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2" + "reference": "d74205c497bfbca49f34d4bc4c19c17e22db4ebb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2", - "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/d74205c497bfbca49f34d4bc4c19c17e22db4ebb", + "reference": "d74205c497bfbca49f34d4bc4c19c17e22db4ebb", "shasum": "" }, "require": { @@ -2052,7 +2052,7 @@ "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", "support": { "issues": "https://github.com/theseer/tokenizer/issues", - "source": "https://github.com/theseer/tokenizer/tree/1.2.3" + "source": "https://github.com/theseer/tokenizer/tree/1.3.0" }, "funding": [ { @@ -2060,7 +2060,7 @@ "type": "github" } ], - "time": "2024-03-03T12:36:25+00:00" + "time": "2025-11-13T13:44:09+00:00" } ], "aliases": [], diff --git a/doc/Installation.md b/doc/Installation.md index 355b2f2d..f5c508bf 100644 --- a/doc/Installation.md +++ b/doc/Installation.md @@ -120,11 +120,13 @@ More details can be found in the ### Web server configuration -A `robots.txt` file is provided in the root dir of PrivateBin. It disallows all -robots from accessing your pastes. It is recommend to place it into the root of -your web directory if you have installed PrivateBin in a subdirectory. Make sure -to adjust it, so that the file paths match your installation. Of course also -adjust the file, if you already use a `robots.txt`. +A `robots.txt` file is provided in the root dir of PrivateBin. It requests bots to +not access (and potentially burn) your pastes. It is recommend to place it into the +root of your web directory if you have installed PrivateBin in a subdirectory. +Make sure to adjust it, so that the file paths match your installation. +Of course also adjust the file, if you already use a `robots.txt`. +More bot detection is implemented in JavaScript, but note none of these mechanisms is a +100% fail-safe way to prevent non-human visitors on your site. A `.htaccess.disabled` file is provided in the root dir of PrivateBin. It blocks some known robots and link-scanning bots. If you use Apache, you can rename the @@ -203,7 +205,7 @@ CREATE INDEX parent ON prefix_comment(pasteid); CREATE TABLE prefix_config ( id CHAR(16) NOT NULL, value TEXT, PRIMARY KEY (id) ); -INSERT INTO prefix_config VALUES('VERSION', '2.0.2'); +INSERT INTO prefix_config VALUES('VERSION', '2.0.3'); ``` In **PostgreSQL**, the `data`, `attachment`, `nickname` and `vizhash` columns diff --git a/i18n/co.json b/i18n/co.json index 73dbd0fe..5ceea497 100644 --- a/i18n/co.json +++ b/i18n/co.json @@ -165,7 +165,7 @@ "ZB": "Zo", "YB": "Yo", "Format": "Furmatu", - "Plain Text": "Testu in chjaru", + "Plain Text": "Testu rozu", "Source Code": "Codice di fonte", "Markdown": "Markdown", "Download attachment": "Scaricà a pezza ghjunta", diff --git a/i18n/fi.json b/i18n/fi.json index bb7bb44b..304c64ab 100644 --- a/i18n/fi.json +++ b/i18n/fi.json @@ -210,13 +210,13 @@ "Encrypted note on %s": "Salattu viesti %sissä", "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Vieraile tässä linkissä nähdäksesi viestin. URL:n antaminen kenellekään antaa heidänkin päästä katsomaan viestiä.", "URL shortener may expose your decrypt key in URL.": "URL-lyhentäjä voi paljastaa purkuavaimesi URL:ssä.", - "URL shortener is enabled by default.": "URL shortener is enabled by default.", + "URL shortener is enabled by default.": "URL-lyhennys on oletuksena käytössä.", "Save document": "Tallenna asiakirja", "Your IP is not authorized to create documents.": "IP:llesi ei ole annettu oikeutta luoda pasteja.", "Trying to shorten a URL that isn't pointing at our instance.": "Yritetään lyhentää URL-osoite, joka ei osoita meidän instanssiiin.", "Proxy error: Proxy URL is empty. This can be a configuration issue, like wrong or missing config keys.": "Virhe kutsuttaessa YOURLS. Luultavasti asetusongelma kuten väärä tai puuttuuva \"apiurl\" tai \"signature\".", "Proxy error: Error parsing proxy response. This can be a configuration issue, like wrong or missing config keys.": "Virhe jäsennettäessä YOURLS-vastausta.", - "Proxy error: Bad response. This can be a configuration issue, like wrong or missing config keys or a temporary outage.": "Proxy error: Bad response. This can be a configuration issue, like wrong or missing config keys or a temporary outage.", + "Proxy error: Bad response. This can be a configuration issue, like wrong or missing config keys or a temporary outage.": "Välityspalvelinvirhe: Virheellinen vastaus. Tämä voi olla asetusongelma, kuten väärä tai puuttuva asetus, tai väliaikainen katkos.", "This secret message can only be displayed once. Would you like to see it now?": "Tämä salainen viesti voidaan näyttää vain kerran. Haluatko nähdä sen nyt?", "Yes, see it": "Kyllä, näet sen", "Dark Mode": "Tumma tila", @@ -229,7 +229,7 @@ "Link copied to clipboard": "Linkki kopioitu leikepöydälle", "Document text": "Liitä teksti", "Tabulator key serves as character (Hit Ctrl+m or Esc to toggle)": "Tabulaattori toimii merkkinä (Paina Ctrl+m tai Esc vaihtaaksesi)", - "Show password": "Show password", - "Hide password": "Hide password", + "Show password": "Näytä salasana", + "Hide password": "Piilota salasana", "Theme": "Teema" } diff --git a/i18n/hu.json b/i18n/hu.json index d284ee18..203d4cf0 100644 --- a/i18n/hu.json +++ b/i18n/hu.json @@ -1,10 +1,10 @@ { "PrivateBin": "PrivateBin", - "%s is a minimalist, open source online pastebin where the server has zero knowledge of stored data. Data is encrypted/decrypted %sin the browser%s using 256 bits AES.": "A %s egy minimalista, nyílt forráskódú adattároló szoftver, ahol a szerver semmilyen információt nem tárol a feltett adatról. Azt ugyanis a %sböngésződ%s segítségével titkosítja és oldja fel 256 bit hosszú titkosítási kulcsú AES-t használva.", + "%s is a minimalist, open source online pastebin where the server has zero knowledge of stored data. Data is encrypted/decrypted %sin the browser%s using 256 bits AES.": "A %s minimalista, nyílt forráskódú adattároló szoftver, ahol a szerver semmilyen információt nem tárol a rábízott adatról. Azt ugyanis a %sböngésződ%s segítségével titkosítja és oldja fel 256 bit hosszú titkosítási kulcsú AES-t használva.", "More information on the project page.": "További információt a projekt oldalán találsz.", "Because ignorance is bliss": "A titok egyfajta hatalom.", "Document does not exist, has expired or has been deleted.": "A bejegyzés nem létezik, lejárt vagy törölve lett.", - "%s requires php %s or above to work. Sorry.": "Bocs, de a %s működéséhez %s vagy ezt meghaladó verziójú php-s környezet szükséges.", + "%s requires php %s or above to work. Sorry.": "Sajnáljuk, de a %s működéséhez %s vagy ezt meghaladó verziójú php-s környezet szükséges.", "%s requires configuration section [%s] to be present in configuration file.": "A %s megfelelő működéséhez a konfigurációs fájlban a [%s] résznek léteznie kell.", "Please wait %d seconds between each post.": [ "Kérlek várj %d másodpercet két beküldés között.", @@ -92,7 +92,7 @@ "%d év" ], "Never": "Soha", - "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.": "Megjegyzés: ez egy teszt szolgáltatás, az adatok bármikor törlődhetnek. Ha visszaélsz vele, kiscicák bánhatják! :)", + "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.": "Megjegyzés: ezen szolgáltatás egy teszt, az adatok bármikor törlődhetnek. Ha visszaélsz vele, kiscicák bánhatják.", "This document will expire in %d seconds.": [ "Ez a bejegyzés %d másodperc múlva megsemmisül.", "Ez a bejegyzés %d másodperc múlva megsemmisül.", @@ -142,7 +142,7 @@ "Anonymous": "Névtelen", "Avatar generated from IP address": "Avatar (az IP cím alapján generáljuk)", "Add comment": "Hozzászólok", - "Optional nickname…": "Becenév (már ha meg akarod adni)", + "Optional nickname…": "Becenév (amennyiben meg akarod adni)", "Post comment": "Beküld", "Sending comment…": "Beküldés alatt...", "Comment posted.": "A hozzászólás beküldve.", @@ -154,7 +154,7 @@ "Your document is %s (Hit Ctrl+c to copy)": "A bejegyzésed a %s címen elérhető. Ctrl+c-vel tudod vágólapra másolni.", "Delete data": "Adat törlése", "Could not create document: %s": "Nem tudtuk létrehozni a bejegyzést: %s", - "Cannot decrypt document: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Nem tudjuk visszafejteni a bejegyzést: a dekódoláshoz szükséges kulcs hiányzik a címből. Talán URL rövidítőt használtál ami kivágta azt belőle?", + "Cannot decrypt document: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Nem tudjuk visszafejteni a bejegyzést: a dekódoláshoz szükséges kulcs hiányzik a címből. Talán URL rövidítőt használtál, amely azt kivágta belőle?", "B": "B", "kB": "kB", "MB": "MB", @@ -190,13 +190,13 @@ "In case this message never disappears please have a look at this FAQ for information to troubleshoot.": "Abban az esetben, ha ez az üzenet mindig látható lenne, látogass el a Gyakran Ismételt Kérdések szekcióba a megoldásához.", "+++ no document text +++": "+++ nincs beillesztett szöveg +++", "Could not get document data: %s": "Az adat megszerzése nem sikerült: %s", - "QR code": "QR kód", - "This website is using an insecure HTTP connection! Please use it only for testing.": "Ez a weboldal nem biztonságos HTTP kapcsolatot használ! Emiatt csak teszt célokra ajánljuk.", + "QR code": "QR-kód", + "This website is using an insecure HTTP connection! Please use it only for testing.": "Ez a weboldal nem biztonságos (HTTP) kapcsolatot használ! Emiatt csak teszt céljára ajánljuk.", "For more information see this FAQ entry.": "További információ ebben a GyIK bejegyzésben található (angolul).", "Your browser may require an HTTPS connection to support the WebCrypto API. Try switching to HTTPS.": "A WebCrypto API használatához a böngésződ számára esetleg HTTPS kapcsolat szükséges. Ezért próbálj meg HTTPS-re váltani.", - "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.": "A böngésződ nem támogatja a WebAssemblyt, ami a zlib tömörítéshez kell. Létre tudsz hozni tömörítetlen dokumentumokat, de tömörítetteket nem tudsz olvasni.", - "waiting on user to provide a password": "Várakozás a felhasználóra jelszó megadása okán", - "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.": "Nem lehetett visszafejteni az adatot. Rossz jelszót ütöttél be? Ismételd meg a fent található gombbal.", + "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.": "A böngésződ nem támogatja a WebAssemblyt, amely zlib-tömörítéshez szükséges. Létrehozhatsz tömörítetlen bejegyzést, de tömörítetteket nem tudsz elolvasni.", + "waiting on user to provide a password": "Várakozás jelszó megadására", + "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.": "Nem sikerült visszafejteni az adatot. Rossz jelszót ütöttél be? Ismételd meg a fentebbi gombbal.", "Retry": "Újrapróbálkozás", "Showing raw text…": "Nyers szöveg mutatása…", "Notice:": "Megjegyzés:", @@ -209,27 +209,27 @@ "Close": "Bezárás", "Encrypted note on %s": "Titkosított jegyzet a %s", "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Látogasd meg ezt a hivatkozást a bejegyzés megtekintéséhez. Ha mások számára is megadod ezt a linket, azzal hozzáférnek ők is.", - "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", - "URL shortener is enabled by default.": "URL shortener is enabled by default.", - "Save document": "Save document", + "URL shortener may expose your decrypt key in URL.": "Az URL-rövidítő kiszolgáltathatja dekódolókulcsod.", + "URL shortener is enabled by default.": "Az URL-rövidítő alapértelmezetten engedélyezett.", + "Save document": "Bejegyzés mentése", "Your IP is not authorized to create documents.": "Your IP is not authorized to create documents.", "Trying to shorten a URL that isn't pointing at our instance.": "Trying to shorten a URL that isn't pointing at our instance.", "Proxy error: Proxy URL is empty. This can be a configuration issue, like wrong or missing config keys.": "Proxy error: Proxy URL is empty. This can be a configuration issue, like wrong or missing config keys.", "Proxy error: Error parsing proxy response. This can be a configuration issue, like wrong or missing config keys.": "Proxy error: Error parsing proxy response. This can be a configuration issue, like wrong or missing config keys.", "Proxy error: Bad response. This can be a configuration issue, like wrong or missing config keys or a temporary outage.": "Proxy error: Bad response. This can be a configuration issue, like wrong or missing config keys or a temporary outage.", - "This secret message can only be displayed once. Would you like to see it now?": "This secret message can only be displayed once. Would you like to see it now?", - "Yes, see it": "Yes, see it", + "This secret message can only be displayed once. Would you like to see it now?": "Ez az üzenet csak egyszer jeleníthető meg. Szeretnéd megnézni?", + "Yes, see it": "Igen", "Dark Mode": "Sötét mód", - "Error compressing document, due to missing WebAssembly support.": "Error compressing document, due to missing WebAssembly support.", + "Error compressing document, due to missing WebAssembly support.": "WebAssembly-támogatás hiánya miatt nem tömöríthetjük a dokumentumot.", "Error decompressing document, your browser does not support WebAssembly. Please use another browser to view this document.": "Error decompressing document, your browser does not support WebAssembly. Please use another browser to view this document.", - "Start over": "Start over", - "Document copied to clipboard": "Document copied to clipboard", - "To copy document press on the copy button or use the clipboard shortcut Ctrl+c/Cmd+c": "To copy document press on the copy button or use the clipboard shortcut Ctrl+c/Cmd+c", - "Copy link": "Copy link", - "Link copied to clipboard": "Link copied to clipboard", - "Document text": "Document text", - "Tabulator key serves as character (Hit Ctrl+m or Esc to toggle)": "Tabulator key serves as character (Hit Ctrl+m or Esc to toggle)", - "Show password": "Show password", - "Hide password": "Hide password", - "Theme": "Theme" + "Start over": "Újrakezdés", + "Document copied to clipboard": "Bejegyzés másolva", + "To copy document press on the copy button or use the clipboard shortcut Ctrl+c/Cmd+c": "Másoláshoz használd a Ctrl+c/Cmd+c billentyűkombinációt", + "Copy link": "Link másolása", + "Link copied to clipboard": "Link másolva", + "Document text": "Bejegyzés szövege", + "Tabulator key serves as character (Hit Ctrl+m or Esc to toggle)": "A tabulátor karakternek használható (nyomd le a Ctrl+m vagy az Esc to billentyűket ennek megszüntetéséhez).", + "Show password": "Jelszó megjelenítése", + "Hide password": "Jelszó elrejtése", + "Theme": "Téma" } diff --git a/i18n/lt.json b/i18n/lt.json index e611d979..d2da30ab 100644 --- a/i18n/lt.json +++ b/i18n/lt.json @@ -3,7 +3,7 @@ "%s is a minimalist, open source online pastebin where the server has zero knowledge of stored data. Data is encrypted/decrypted %sin the browser%s using 256 bits AES.": "%s yra minimalistinis, atvirojo kodo internetinis įdėjimų dėklas, kurį naudojant, serveris nieko nenutuokia apie įdėtus duomenis. Duomenys yra šifruojami/iššifruojami %snaršyklėje%s naudojant 256 bitų AES.", "More information on the project page.": "Daugiau informacijos rasite projekto puslapyje.", "Because ignorance is bliss": "Nes nežinojimas yra palaima", - "Document does not exist, has expired or has been deleted.": "Įdėjimo nėra, jis nebegalioja arba buvo ištrintas.", + "Document does not exist, has expired or has been deleted.": "Dokumento nėra, jis nebegalioja arba buvo ištrintas.", "%s requires php %s or above to work. Sorry.": "%s savo darbui reikalauja php %s arba naujesnės versijos. Apgailestaujame.", "%s requires configuration section [%s] to be present in configuration file.": "%s reikalauja, kad konfigūracijos faile būtų [%s] konfigūracijos sekcija.", "Please wait %d seconds between each post.": [ @@ -14,15 +14,15 @@ "Tarp kiekvieno įrašo palaukite %d sekundžių.", "Tarp kiekvieno įrašo palaukite %d sekundžių." ], - "Document is limited to %s of encrypted data.": "Įdėjimas yra apribotas iki %s šifruotų duomenų.", + "Document is limited to %s of encrypted data.": "Dokumentas yra apribotas iki %s šifruotų duomenų.", "Invalid data.": "Neteisingi duomenys.", "You are unlucky. Try again.": "Jums nesiseka. Bandykite dar kartą.", "Error saving comment. Sorry.": "Klaida įrašant komentarą. Apgailestaujame.", - "Error saving document. Sorry.": "Klaida įrašant įdėjimą. Apgailestaujame.", - "Invalid document ID.": "Neteisingas įdėjimo ID.", - "Document is not of burn-after-reading type.": "Įdėjimo tipas nėra „Perskaičius sudeginti“.", - "Wrong deletion token. Document was not deleted.": "Neteisingas ištrynimo prieigos raktas. Įdėjimas nebuvo ištrintas.", - "Document was properly deleted.": "Įdėjimas buvo tinkamai ištrintas.", + "Error saving document. Sorry.": "Klaida įrašant dokumentą. Apgailestaujame.", + "Invalid document ID.": "Neteisingas dokumento ID.", + "Document is not of burn-after-reading type.": "Dokumento tipas nėra „Perskaičius sudeginti“.", + "Wrong deletion token. Document was not deleted.": "Neteisingas ištrynimo prieigos raktas. Dokumentas nebuvo ištrintas.", + "Document was properly deleted.": "Dokumentas buvo tinkamai ištrintas.", "JavaScript is required for %s to work. Sorry for the inconvenience.": "%s darbui reikalinga JavaScript. Atsiprašome už nepatogumus.", "%s requires a modern browser to work.": "%s savo darbui reikalauja šiuolaikinės naršyklės.", "New": "Naujas", @@ -133,9 +133,9 @@ "Šis dokumentas nustos galioti po %d mėnesių.", "Šis dokumentas nustos galioti po %d mėnesių." ], - "Please enter the password for this document:": "Įveskite šio įdėjimo slaptažodį:", + "Please enter the password for this document:": "Įveskite šio dokumento slaptažodį:", "Could not decrypt data (Wrong key?)": "Nepavyko iššifruoti duomenų (Neteisingas raktas?)", - "Could not delete the document, it was not stored in burn after reading mode.": "Nepavyko ištrinti įdėjimo, jis nebuvo saugomas „Perskaičius sudeginti“ veiksenoje.", + "Could not delete the document, it was not stored in burn after reading mode.": "Nepavyko ištrinti dokumento, jis nebuvo saugomas „Perskaičius sudeginti“ veiksenoje.", "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.": "SKIRTA TIK JŪSŲ AKIMS. Neužverkite šio lango, šis pranešimas negalės būti rodomas dar kartą.", "Could not decrypt comment; Wrong key?": "Nepavyko iššifruoti komentaro; Neteisingas raktas?", "Reply": "Atsakyti", @@ -150,11 +150,11 @@ "unknown status": "nežinoma būsena", "server error or not responding": "serverio klaida arba jis neatsako", "Could not post comment: %s": "Nepavyko paskelbti komentaro: %s", - "Sending document…": "Siunčiamas įdėjimas…", - "Your document is %s (Hit Ctrl+c to copy)": "Jūsų įdėjimas yra %s (Paspauskite Vald+c norėdami nukopijuoti)", + "Sending document…": "Siunčiamas dokumentas…", + "Your document is %s (Hit Ctrl+c to copy)": "Jūsų dokumentas yra %s (Paspauskite Ctrl+c norėdami nukopijuoti)", "Delete data": "Ištrinti duomenis", - "Could not create document: %s": "Nepavyko sukurti įdėjimo: %s", - "Cannot decrypt document: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Nepavyksta iššifruoti įdėjimo: URL adrese trūksta iššifravimo rakto (Ar naudojote peradresavimo ar URL trumpinimo įrankį, kuris pašalina URL dalį?)", + "Could not create document: %s": "Nepavyko sukurti dokumento: %s", + "Cannot decrypt document: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Nepavyksta iššifruoti dokumento: URL adrese trūksta iššifravimo rakto (Ar naudojote peradresavimo ar URL trumpinimo įrankį, kuris pašalina URL dalį?)", "B": "B", "kB": "kB", "MB": "MB", @@ -170,7 +170,7 @@ "Markdown": "„Markdown“", "Download attachment": "Atsisiųsti priedą", "Cloned: '%s'": "Dubliuota: „%s“", - "The cloned file '%s' was attached to this document.": "Dubliuotas failas „%s“ buvo pridėtas į šį įdėjimą.", + "The cloned file '%s' was attached to this document.": "Dubliuotas failas „%s“ buvo pridėtas į šį dokumentą.", "Attach a file": "Pridėti failą", "alternatively drag & drop a file or paste an image from the clipboard": "arba kitaip - tempkite failą arba įdėkite paveikslą iš iškarpinės", "File too large, to display a preview. Please download the attachment.": "Failas per didelis, kad būtų rodoma peržiūra. Atsisiųskite priedą.", @@ -185,11 +185,11 @@ "Decrypt": "Iššifruoti", "Enter password": "Įveskite slaptažodį", "Loading…": "Įkeliama…", - "Decrypting document…": "Iššifruojamas įdėjimas…", - "Preparing new document…": "Ruošiamas naujas įdėjimas…", + "Decrypting document…": "Iššifruojamas dokumentas…", + "Preparing new document…": "Ruošiamas naujas dokumentas…", "In case this message never disappears please have a look at this FAQ for information to troubleshoot.": "Jeigu šis pranešimas niekada nedingsta, pasižiūrėkite šį DUK skyrių, kuriame yra informacija apie nesklandumų šalinimą.", - "+++ no document text +++": "+++ nėra įdėjimo teksto +++", - "Could not get document data: %s": "Nepavyko gauti įdėjimo duomenų: %s", + "+++ no document text +++": "+++ nėra dokumento teksto +++", + "Could not get document data: %s": "Nepavyko gauti dokumento duomenų: %s", "QR code": "QR kodas", "This website is using an insecure HTTP connection! Please use it only for testing.": "Ši internetinė svetainė naudoja nesaugų HTTP ryšį! Naudokite ją tik bandymams.", "For more information see this FAQ entry.": "Išsamesnei informacijai, žiūrėkite šį DUK įrašą.", @@ -210,26 +210,26 @@ "Encrypted note on %s": "Šifruoti užrašai ties %s", "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Norėdami matyti užrašus, aplankykite šį tinklalapį. Pasidalinus šiuo URL adresu su kitais žmonėmis, jiems taip pat bus leidžiama prieiga prie šių užrašų.", "URL shortener may expose your decrypt key in URL.": "URL trumpinimo įrankis gali atskleisti URL adrese jūsų iššifravimo raktą.", - "URL shortener is enabled by default.": "URL shortener is enabled by default.", - "Save document": "Įrašyti įdėjimą", - "Your IP is not authorized to create documents.": "Jūsų IP adresas neturi įgaliojimų kurti įdėjimų.", + "URL shortener is enabled by default.": "URL trumpinimo įrankis pagal numatymą įjungtas.", + "Save document": "Įrašyti dokumentą", + "Your IP is not authorized to create documents.": "Jūsų IP adresas neturi įgaliojimų kurti dokumentus.", "Trying to shorten a URL that isn't pointing at our instance.": "Bandoma sutrumpinti URL adresą, kuris nenurodo į mūsų egzempliorių.", - "Proxy error: Proxy URL is empty. This can be a configuration issue, like wrong or missing config keys.": "Klaida iškviečiant YOURLS. Tikriausiai, konfigūracijos klaida, pavyzdžiui, neteisingi „apiurl“ ar „signature“, arba jų nėra.", - "Proxy error: Error parsing proxy response. This can be a configuration issue, like wrong or missing config keys.": "Klaida nagrinėjant YOURLS atsaką.", - "Proxy error: Bad response. This can be a configuration issue, like wrong or missing config keys or a temporary outage.": "Proxy error: Bad response. This can be a configuration issue, like wrong or missing config keys or a temporary outage.", + "Proxy error: Proxy URL is empty. This can be a configuration issue, like wrong or missing config keys.": "Įgaliotojo serverio klaida: Įgaliotojo serverio URL yra tuščias. Tai gali būti konfigūracijos sukelta problema, pavyzdžiui, neteisingi arba trūkstami konfigūracijos raktai.", + "Proxy error: Error parsing proxy response. This can be a configuration issue, like wrong or missing config keys.": "Įgaliotojo serverio klaida: Klaida nagrinėjant įgaliotojo serverio atsaką. Tai gali būti konfigūracijos sukelta problema, pavyzdžiui, neteisingi arba trūkstami konfigūracijos raktai.", + "Proxy error: Bad response. This can be a configuration issue, like wrong or missing config keys or a temporary outage.": "Įgaliotojo serverio klaida: Blogas atsakas. Tai gali būti konfigūracijos sukelta problema, pavyzdžiui, neteisingi arba trūkstami konfigūracijos raktai, arba laikinas avarinis atjungimas.", "This secret message can only be displayed once. Would you like to see it now?": "Ši slapta žinutė gali būti parodyta tik vieną kartą. Ar norėtumėte ją dabar pamatyti?", "Yes, see it": "Taip, pamatyti", "Dark Mode": "Tamsi veiksena", - "Error compressing document, due to missing WebAssembly support.": "Klaida glaudinant įdėjimą, nes trūksta WebAssembly palaikymo.", - "Error decompressing document, your browser does not support WebAssembly. Please use another browser to view this document.": "Klaida išglaudinant įdėjimą, jūsų naršyklė nepalaiko WebAssembly. Norėdami peržiūrėti šį įdėjimą, naudokite kitą naršyklę.", - "Start over": "Start over", - "Document copied to clipboard": "Document copied to clipboard", - "To copy document press on the copy button or use the clipboard shortcut Ctrl+c/Cmd+c": "To copy document press on the copy button or use the clipboard shortcut Ctrl+c/Cmd+c", - "Copy link": "Copy link", - "Link copied to clipboard": "Link copied to clipboard", - "Document text": "Document text", - "Tabulator key serves as character (Hit Ctrl+m or Esc to toggle)": "Tabulator key serves as character (Hit Ctrl+m or Esc to toggle)", - "Show password": "Show password", - "Hide password": "Hide password", - "Theme": "Theme" + "Error compressing document, due to missing WebAssembly support.": "Klaida glaudinant dokumentą, nes trūksta „WebAssembly“ palaikymo.", + "Error decompressing document, your browser does not support WebAssembly. Please use another browser to view this document.": "Klaida išglaudinant dokumentą, jūsų naršyklė nepalaiko „WebAssembly“. Norėdami peržiūrėti šį dokumentą, naudokite kitą naršyklę.", + "Start over": "Pradėti iš naujo", + "Document copied to clipboard": "Dokumentas nukopijuotas į iškarpinę", + "To copy document press on the copy button or use the clipboard shortcut Ctrl+c/Cmd+c": "Norėdami nukopijuoti dokumentą paspauskite kopijavimo mygtuką arba naudokite iškarpinės sparčiuosius klavišus Ctrl+c/Cmd+c", + "Copy link": "Kopijuoti nuorodą", + "Link copied to clipboard": "Nuoroda nukopijuota į iškarpinę", + "Document text": "Dokumento tekstas", + "Tabulator key serves as character (Hit Ctrl+m or Esc to toggle)": "Tabuliatoriaus klavišas tarnauja kaip simbolis (Paspauskite Ctrl+m arba Esc norėdami perjungti)", + "Show password": "Rodyti slaptažodį", + "Hide password": "Slėpti slaptažodį", + "Theme": "Apipavidalinimas" } diff --git a/i18n/pl.json b/i18n/pl.json index 4e4c8431..ec85e946 100644 --- a/i18n/pl.json +++ b/i18n/pl.json @@ -229,7 +229,7 @@ "Link copied to clipboard": "Link skopiowany do schowka", "Document text": "Treść dokumentu", "Tabulator key serves as character (Hit Ctrl+m or Esc to toggle)": "Klawisz Tabulatora służy jako znak (użyj Ctrl+m lub Esc, aby przełączyć tryb)", - "Show password": "Show password", - "Hide password": "Hide password", + "Show password": "Pokaż hasło", + "Hide password": "Ukryj hasło", "Theme": "Motyw" } diff --git a/i18n/sl.json b/i18n/sl.json index 4dae8239..34a7d654 100644 --- a/i18n/sl.json +++ b/i18n/sl.json @@ -164,16 +164,16 @@ "EB": "EB", "ZB": "ZB", "YB": "YB", - "Format": "Format", + "Format": "Vrsta", "Plain Text": "Surov tekst", "Source Code": "Odprta koda", "Markdown": "Markdown", "Download attachment": "Pretoči priponko", "Cloned: '%s'": "'%s' klonirana", - "The cloned file '%s' was attached to this document.": "The cloned file '%s' was attached to this document.", + "The cloned file '%s' was attached to this document.": "Klonirana datoteka '%s' je bila priložena temu dokumentu.", "Attach a file": "Pripni datoteko", - "alternatively drag & drop a file or paste an image from the clipboard": "alternatively drag & drop a file or paste an image from the clipboard", - "File too large, to display a preview. Please download the attachment.": "File too large, to display a preview. Please download the attachment.", + "alternatively drag & drop a file or paste an image from the clipboard": "lahko pa datoteko povlečete in spustite ali pa prilepite sliko iz odložišča", + "File too large, to display a preview. Please download the attachment.": "Datoteka je prevelika za prikaz predogleda. Prenesite prilogo.", "Remove attachment": "Odstrani priponko", "Your browser does not support uploading encrypted files. Please use a newer browser.": "Tvoj brskalnik ne omogoča nalaganje zakodiranih datotek. Prosim uporabi novejši brskalnik.", "Invalid attachment.": "Neveljavna priponka.", @@ -181,55 +181,55 @@ "Shorten URL": "Skrajšajte URL", "Editor": "Uredi", "Preview": "Predogled", - "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.": "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.", - "Decrypt": "Decrypt", + "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.": "%s zahteva, da se POT konča z \"%s\". Prosimo, posodobite POT v datoteki index.php.", + "Decrypt": "Dešifriraj", "Enter password": "Prosim vnesi geslo", - "Loading…": "Loading…", - "Decrypting document…": "Decrypting document…", - "Preparing new document…": "Preparing new document…", + "Loading…": "Nalaganje…", + "Decrypting document…": "Dešifriranje dokumenta…", + "Preparing new document…": "Pripravljanje novega dokumenta…", "In case this message never disappears please have a look at this FAQ for information to troubleshoot.": "In case this message never disappears please have a look at this FAQ for information to troubleshoot (in English).", - "+++ no document text +++": "+++ no document text +++", - "Could not get document data: %s": "Could not get document data: %s", - "QR code": "QR code", - "This website is using an insecure HTTP connection! Please use it only for testing.": "This website is using an insecure HTTP connection! Please use it only for testing.", - "For more information see this FAQ entry.": "For more information see this FAQ entry.", - "Your browser may require an HTTPS connection to support the WebCrypto API. Try switching to HTTPS.": "Your browser may require an HTTPS connection to support the WebCrypto API. Try switching to HTTPS.", - "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.": "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.", - "waiting on user to provide a password": "waiting on user to provide a password", - "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.": "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.", - "Retry": "Retry", - "Showing raw text…": "Showing raw text…", - "Notice:": "Notice:", - "This link will expire after %s.": "This link will expire after %s.", - "This link can only be accessed once, do not use back or refresh button in your browser.": "This link can only be accessed once, do not use back or refresh button in your browser.", - "Link:": "Link:", - "Recipient may become aware of your timezone, convert time to UTC?": "Recipient may become aware of your timezone, convert time to UTC?", - "Use Current Timezone": "Use Current Timezone", - "Convert To UTC": "Convert To UTC", - "Close": "Close", - "Encrypted note on %s": "Encrypted note on %s", - "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.", - "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", - "URL shortener is enabled by default.": "URL shortener is enabled by default.", - "Save document": "Save document", - "Your IP is not authorized to create documents.": "Your IP is not authorized to create documents.", - "Trying to shorten a URL that isn't pointing at our instance.": "Trying to shorten a URL that isn't pointing at our instance.", - "Proxy error: Proxy URL is empty. This can be a configuration issue, like wrong or missing config keys.": "Proxy error: Proxy URL is empty. This can be a configuration issue, like wrong or missing config keys.", - "Proxy error: Error parsing proxy response. This can be a configuration issue, like wrong or missing config keys.": "Proxy error: Error parsing proxy response. This can be a configuration issue, like wrong or missing config keys.", - "Proxy error: Bad response. This can be a configuration issue, like wrong or missing config keys or a temporary outage.": "Proxy error: Bad response. This can be a configuration issue, like wrong or missing config keys or a temporary outage.", - "This secret message can only be displayed once. Would you like to see it now?": "This secret message can only be displayed once. Would you like to see it now?", - "Yes, see it": "Yes, see it", + "+++ no document text +++": "+++ ni besedila dokumenta +++", + "Could not get document data: %s": "Podatkov dokumenta ni bilo mogoče pridobiti: %s", + "QR code": "QR koda", + "This website is using an insecure HTTP connection! Please use it only for testing.": "To spletno mesto uporablja nezaščiteno povezavo HTTP! Prosimo, uporabite jo samo za testiranje.", + "For more information see this FAQ entry.": "Za več informacij glejte ta vnos s pogostimi vprašanji.", + "Your browser may require an HTTPS connection to support the WebCrypto API. Try switching to HTTPS.": "Vaš brskalnik morda zahteva povezavo HTTPS za podporo API-ja WebCrypto. Poskusite preklopiti na HTTPS.", + "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.": "Vaš brskalnik ne podpira WebAssemblyja, ki se uporablja za stiskanje zlib. Nestisnjene dokumente lahko ustvarite, stisnjenih pa ne morete brati.", + "waiting on user to provide a password": "čakanje na uporabnika, da vnese geslo", + "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.": "Podatkov ni bilo mogoče dešifrirati. Ste vnesli napačno geslo? Poskusite znova z gumbom na vrhu.", + "Retry": "Poskusi ponovno", + "Showing raw text…": "Prikaz surovega besedila…", + "Notice:": "Obvestilo:", + "This link will expire after %s.": "Ta povezava bo potekla čez %s.", + "This link can only be accessed once, do not use back or refresh button in your browser.": "Do te povezave lahko dostopate samo enkrat, ne uporabljajte gumba za nazaj ali osvežitev v brskalniku.", + "Link:": "Povezava:", + "Recipient may become aware of your timezone, convert time to UTC?": "Prejemnik lahko izve vaš časovni pas in pretvori čas v UTC?", + "Use Current Timezone": "Uporabi trenutni časovni pas", + "Convert To UTC": "Pretvori v UTC", + "Close": "Zapri", + "Encrypted note on %s": "Šifrirana opomba na %s", + "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Za ogled opombe obiščite to povezavo. Če URL posredujete komurkoli, jim omogočite dostop do opombe.", + "URL shortener may expose your decrypt key in URL.": "Okrajševalec URL-jev lahko razkrije vaš ključ za dešifriranje v URL-ju.", + "URL shortener is enabled by default.": "Okrajševalec URL-jev je privzeto omogočen.", + "Save document": "Shrani dokument", + "Your IP is not authorized to create documents.": "Vaš IP ni pooblaščen za ustvarjanje dokumentov.", + "Trying to shorten a URL that isn't pointing at our instance.": "Poskus skrajšanja URL, ki ne kaže na naš primerek.", + "Proxy error: Proxy URL is empty. This can be a configuration issue, like wrong or missing config keys.": "Napaka posredniškega strežnika: URL posredniškega strežnika je prazen. To je lahko težava s konfiguracijo, na primer napačni ali manjkajoči konfiguracijski ključi.", + "Proxy error: Error parsing proxy response. This can be a configuration issue, like wrong or missing config keys.": "Napaka posredniškega strežnika: Napaka pri razčlenjevanju odgovora posredniškega strežnika. To je lahko težava s konfiguracijo, na primer napačni ali manjkajoči konfiguracijski ključi.", + "Proxy error: Bad response. This can be a configuration issue, like wrong or missing config keys or a temporary outage.": "Napaka posredniškega strežnika: Slab odgovor. To je lahko težava s konfiguracijo, na primer napačni ali manjkajoči konfiguracijski ključi ali začasni izpad.", + "This secret message can only be displayed once. Would you like to see it now?": "To skrivno sporočilo je mogoče prikazati samo enkrat. Ali ga želite videti zdaj?", + "Yes, see it": "Da, pokaži", "Dark Mode": "Temni način", - "Error compressing document, due to missing WebAssembly support.": "Error compressing document, due to missing WebAssembly support.", - "Error decompressing document, your browser does not support WebAssembly. Please use another browser to view this document.": "Error decompressing document, your browser does not support WebAssembly. Please use another browser to view this document.", - "Start over": "Start over", - "Document copied to clipboard": "Document copied to clipboard", - "To copy document press on the copy button or use the clipboard shortcut Ctrl+c/Cmd+c": "To copy document press on the copy button or use the clipboard shortcut Ctrl+c/Cmd+c", - "Copy link": "Copy link", - "Link copied to clipboard": "Link copied to clipboard", - "Document text": "Document text", - "Tabulator key serves as character (Hit Ctrl+m or Esc to toggle)": "Tabulator key serves as character (Hit Ctrl+m or Esc to toggle)", - "Show password": "Show password", - "Hide password": "Hide password", - "Theme": "Theme" + "Error compressing document, due to missing WebAssembly support.": "Napaka pri stiskanju dokumenta zaradi manjkajoče podpore za WebAssembly.", + "Error decompressing document, your browser does not support WebAssembly. Please use another browser to view this document.": "Napaka pri razpakiranju dokumenta, vaš brskalnik ne podpira WebAssembly. Za ogled tega dokumenta uporabite drug brskalnik.", + "Start over": "Začni znova", + "Document copied to clipboard": "Dokument kopiran v odložišče", + "To copy document press on the copy button or use the clipboard shortcut Ctrl+c/Cmd+c": "Za kopiranje dokumenta pritisnite gumb za kopiranje ali uporabite bližnjico odložišča Ctrl+c/Cmd+c", + "Copy link": "Kopiraj povezavo", + "Link copied to clipboard": "Povezava kopirana v odložišče", + "Document text": "Besedilo dokumenta", + "Tabulator key serves as character (Hit Ctrl+m or Esc to toggle)": "Tabulatorska tipka služi kot znak (za preklop pritisnite Ctrl+m ali Esc)", + "Show password": "Pokaži geslo", + "Hide password": "Skrij geslo", + "Theme": "Tema" } diff --git a/i18n/sv.json b/i18n/sv.json index 09219db1..553632ec 100644 --- a/i18n/sv.json +++ b/i18n/sv.json @@ -1,160 +1,160 @@ { "PrivateBin": "PrivateBin", - "%s is a minimalist, open source online pastebin where the server has zero knowledge of stored data. Data is encrypted/decrypted %sin the browser%s using 256 bits AES.": "%s is a minimalist, open source online pastebin where the server has zero knowledge of stored data. Data is encrypted/decrypted %sin the browser%s using 256 bits AES.", - "More information on the project page.": "More information on the project page.", - "Because ignorance is bliss": "Because ignorance is bliss", - "Document does not exist, has expired or has been deleted.": "Document does not exist, has expired or has been deleted.", - "%s requires php %s or above to work. Sorry.": "%s requires php %s or above to work. Sorry.", - "%s requires configuration section [%s] to be present in configuration file.": "%s requires configuration section [%s] to be present in configuration file.", + "%s is a minimalist, open source online pastebin where the server has zero knowledge of stored data. Data is encrypted/decrypted %sin the browser%s using 256 bits AES.": "%s är en minimalistisk, öppen källkods-pastebin där servern inte har någon kunskap om lagrad data. Data krypteras/dekrypteras %si webbläsaren%s med AES 256-bit.", + "More information on the project page.": "Mer information på projektsidan.", + "Because ignorance is bliss": "Okunnighet är salighet", + "Document does not exist, has expired or has been deleted.": "Dokumentet finns inte, har gått ut eller har raderats.", + "%s requires php %s or above to work. Sorry.": "%s kräver PHP %s eller senare för att fungera.", + "%s requires configuration section [%s] to be present in configuration file.": "%s kräver att konfigurationsavsnittet [%s] finns i konfigurationsfilen.", "Please wait %d seconds between each post.": [ - "Please wait %d second between each post. (singular)", - "Please wait %d seconds between each post. (1st plural)", - "Please wait %d seconds between each post. (2nd plural)", - "Please wait %d seconds between each post. (3rd plural)", - "Please wait %d seconds between each post. (4th plural)", - "Please wait %d seconds between each post. (5th plural)" + "Vänta %d sekund mellan varje inlägg.", + "Vänta %d sekunder mellan varje inlägg.", + "Vänta %d sekunder mellan varje inlägg.", + "Vänta %d sekunder mellan varje inlägg.", + "Vänta %d sekunder mellan varje inlägg.", + "Vänta %d sekunder mellan varje inlägg." ], - "Document is limited to %s of encrypted data.": "Document is limited to %s of encrypted data.", - "Invalid data.": "Invalid data.", - "You are unlucky. Try again.": "You are unlucky. Try again.", - "Error saving comment. Sorry.": "Error saving comment. Sorry.", - "Error saving document. Sorry.": "Error saving document. Sorry.", - "Invalid document ID.": "Invalid document ID.", - "Document is not of burn-after-reading type.": "Document is not of burn-after-reading type.", - "Wrong deletion token. Document was not deleted.": "Wrong deletion token. Document was not deleted.", - "Document was properly deleted.": "Document was properly deleted.", - "JavaScript is required for %s to work. Sorry for the inconvenience.": "JavaScript is required for %s to work. Sorry for the inconvenience.", - "%s requires a modern browser to work.": "%s requires a modern browser to work.", - "New": "New", + "Document is limited to %s of encrypted data.": "Dokumentet är begränsat till %s krypterad data.", + "Invalid data.": "Ogiltig data.", + "You are unlucky. Try again.": "Otur. Försök igen.", + "Error saving comment. Sorry.": "Fel vid sparande av kommentar.", + "Error saving document. Sorry.": "Fel vid sparande av dokument.", + "Invalid document ID.": "Ogiltigt dokument-ID.", + "Document is not of burn-after-reading type.": "Dokumentet är inte av typen ”bränn efter läsning”.", + "Wrong deletion token. Document was not deleted.": "Fel raderingstoken. Dokumentet raderades inte.", + "Document was properly deleted.": "Dokumentet har raderats.", + "JavaScript is required for %s to work. Sorry for the inconvenience.": "JavaScript krävs för att %s ska fungera. Ursäkta besväret.", + "%s requires a modern browser to work.": "%s kräver en modern webbläsare.", + "New": "Ny", "Create": "Skapa", - "Clone": "Clone", - "Raw text": "Raw text", - "Expires": "Expires", - "Burn after reading": "Burn after reading", - "Open discussion": "Open discussion", - "Password (recommended)": "Password (recommended)", - "Discussion": "Discussion", - "Toggle navigation": "Toggle navigation", + "Clone": "Klona", + "Raw text": "Råtext", + "Expires": "Går ut", + "Burn after reading": "Bränn efter läsning", + "Open discussion": "Öppen diskussion", + "Password (recommended)": "Lösenord (rekommenderas)", + "Discussion": "Diskussion", + "Toggle navigation": "Växla navigering", "%d seconds": [ - "%d second (singular)", - "%d seconds (1st plural)", - "%d seconds (2nd plural)", - "%d seconds (3rd plural)", - "%d seconds (4th plural)", - "%d seconds (5th plural)" + "%d sekund", + "%d sekunder", + "%d sekunder", + "%d sekunder", + "%d sekunder", + "%d sekunder" ], "%d minutes": [ - "%d minute (singular)", - "%d minutes (1st plural)", - "%d minutes (2nd plural)", - "%d minutes (3rd plural)", - "%d minutes (4th plural)", - "%d minutes (5th plural)" + "%d minut", + "%d minuter", + "%d minuter", + "%d minuter", + "%d minuter", + "%d minuter" ], "%d hours": [ - "%d hour (singular)", - "%d hours (1st plural)", - "%d hours (2nd plural)", - "%d hours (3rd plural)", - "%d hours (4th plural)", - "%d hours (5th plural)" + "%d timme", + "%d timmar", + "%d timmar", + "%d timmar", + "%d timmar", + "%d timmar" ], "%d days": [ - "%d day (singular)", - "%d days (1st plural)", - "%d days (2nd plural)", - "%d days (3rd plural)", - "%d days (4th plural)", - "%d days (5th plural)" + "%d dag", + "%d dagar", + "%d dagar", + "%d dagar", + "%d dagar", + "%d dagar" ], "%d weeks": [ - "%d week (singular)", - "%d weeks (1st plural)", - "%d weeks (2nd plural)", - "%d weeks (3rd plural)", - "%d weeks (4th plural)", - "%d weeks (5th plural)" + "%d vecka", + "%d veckor", + "%d veckor", + "%d veckor", + "%d veckor", + "%d veckor" ], "%d months": [ - "%d month (singular)", - "%d months (1st plural)", - "%d months (2nd plural)", - "%d months (3rd plural)", - "%d months (4th plural)", - "%d months (5th plural)" + "%d månad", + "%d månader", + "%d månader", + "%d månader", + "%d månader", + "%d månader" ], "%d years": [ - "%d year (singular)", - "%d years (1st plural)", - "%d years (2nd plural)", - "%d years (3rd plural)", - "%d years (4th plural)", - "%d years (5th plural)" + "%d år", + "%d år", + "%d år", + "%d år", + "%d år", + "%d år" ], - "Never": "Never", - "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.": "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.", + "Never": "Aldrig", + "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.": "Observera: Detta är en testtjänst. Data kan raderas när som helst. Missbruka inte denna tjänst.", "This document will expire in %d seconds.": [ - "This document will expire in %d second. (singular)", - "This document will expire in %d seconds. (1st plural)", - "This document will expire in %d seconds. (2nd plural)", - "This document will expire in %d seconds. (3rd plural)", - "This document will expire in %d seconds. (4th plural)", - "This document will expire in %d seconds. (5th plural)" + "Detta dokument går ut om %d sekund.", + "Detta dokument går ut om %d sekunder.", + "Detta dokument går ut om %d sekunder.", + "Detta dokument går ut om %d sekunder.", + "Detta dokument går ut om %d sekunder.", + "Detta dokument går ut om %d sekunder." ], "This document will expire in %d minutes.": [ - "This document will expire in %d minute. (singular)", - "This document will expire in %d minutes. (1st plural)", - "This document will expire in %d minutes. (2nd plural)", - "This document will expire in %d minutes. (3rd plural)", - "This document will expire in %d minutes. (4th plural)", - "This document will expire in %d minutes. (5th plural)" + "Detta dokument går ut om %d minut.", + "Detta dokument går ut om %d minuter.", + "Detta dokument går ut om %d minuter.", + "Detta dokument går ut om %d minuter.", + "Detta dokument går ut om %d minuter.", + "Detta dokument går ut om %d minuter." ], "This document will expire in %d hours.": [ - "This document will expire in %d hour. (singular)", - "This document will expire in %d hours. (1st plural)", - "This document will expire in %d hours. (2nd plural)", - "This document will expire in %d hours. (3rd plural)", - "This document will expire in %d hours. (4th plural)", - "This document will expire in %d hours. (5th plural)" + "Detta dokument går ut om %d timme.", + "Detta dokument går ut om %d timmar.", + "Detta dokument går ut om %d timmar.", + "Detta dokument går ut om %d timmar.", + "Detta dokument går ut om %d timmar.", + "Detta dokument går ut om %d timmar." ], "This document will expire in %d days.": [ - "This document will expire in %d day. (singular)", - "This document will expire in %d days. (1st plural)", - "This document will expire in %d days. (2nd plural)", - "This document will expire in %d days. (3rd plural)", - "This document will expire in %d days. (4th plural)", - "This document will expire in %d days. (5th plural)" + "Detta dokument går ut om %d dag.", + "Detta dokument går ut om %d dagar.", + "Detta dokument går ut om %d dagar.", + "Detta dokument går ut om %d dagar.", + "Detta dokument går ut om %d dagar.", + "Detta dokument går ut om %d dagar." ], "This document will expire in %d months.": [ - "This document will expire in %d month. (singular)", - "This document will expire in %d months. (1st plural)", - "This document will expire in %d months. (2nd plural)", - "This document will expire in %d months. (3rd plural)", - "This document will expire in %d months. (4th plural)", - "This document will expire in %d months. (5th plural)" + "Detta dokument går ut om %d månad.", + "Detta dokument går ut om %d månader.", + "Detta dokument går ut om %d månader.", + "Detta dokument går ut om %d månader.", + "Detta dokument går ut om %d månader.", + "Detta dokument går ut om %d månader." ], - "Please enter the password for this document:": "Please enter the password for this document:", - "Could not decrypt data (Wrong key?)": "Could not decrypt data (Wrong key?)", - "Could not delete the document, it was not stored in burn after reading mode.": "Could not delete the document, it was not stored in burn after reading mode.", - "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.": "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.", - "Could not decrypt comment; Wrong key?": "Could not decrypt comment; Wrong key?", - "Reply": "Reply", - "Anonymous": "Anonymous", - "Avatar generated from IP address": "Avatar generated from IP address", - "Add comment": "Add comment", - "Optional nickname…": "Optional nickname…", - "Post comment": "Post comment", - "Sending comment…": "Sending comment…", - "Comment posted.": "Comment posted.", - "Could not refresh display: %s": "Could not refresh display: %s", - "unknown status": "unknown status", - "server error or not responding": "server error or not responding", - "Could not post comment: %s": "Could not post comment: %s", - "Sending document…": "Sending document…", - "Your document is %s (Hit Ctrl+c to copy)": "Your document is %s (Hit Ctrl+c to copy)", - "Delete data": "Delete data", - "Could not create document: %s": "Could not create document: %s", - "Cannot decrypt document: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Cannot decrypt document: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)", + "Please enter the password for this document:": "Ange lösenordet för detta dokument:", + "Could not decrypt data (Wrong key?)": "Kunde inte dekryptera data (fel nyckel?)", + "Could not delete the document, it was not stored in burn after reading mode.": "Kunde inte radera dokumentet, det lagrades inte i läget bränn efter läsning.", + "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.": "ENDAST FÖR DINA ÖGON. Stänger du fönstret så visas detta meddelande inte igen.", + "Could not decrypt comment; Wrong key?": "Kunde inte dekryptera kommentar; fel nyckel?", + "Reply": "Svara", + "Anonymous": "Anonym\n", + "Avatar generated from IP address": "Avatar genererad från IP-adress", + "Add comment": "Lägg till kommentar", + "Optional nickname…": "Valfritt smeknamn…", + "Post comment": "Publicera kommentar", + "Sending comment…": "Skickar kommentar…", + "Comment posted.": "Kommentar publicerad.", + "Could not refresh display: %s": "Kunde inte uppdatera visningen: %s", + "unknown status": "okänd status", + "server error or not responding": "serverfel eller inget svar", + "Could not post comment: %s": "Kunde inte publicera kommentar: %s", + "Sending document…": "Skickar dokument…", + "Your document is %s (Hit Ctrl+c to copy)": "Ditt dokument är %s (Tryck Ctrl+c för att kopiera)", + "Delete data": "Radera data", + "Could not create document: %s": "Kunde inte skapa dokument: %s", + "Cannot decrypt document: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Kan inte dekryptera dokument: Dekrypteringsnyckel saknas i URL:en (använde du en omdirigerare eller URL-förkortare som tar bort delar av URL:en?)", "B": "B", "kB": "kB", "MB": "MB", @@ -165,71 +165,71 @@ "ZB": "ZB", "YB": "YB", "Format": "Format", - "Plain Text": "Plain Text", - "Source Code": "Source Code", + "Plain Text": "Ren text", + "Source Code": "Källkod", "Markdown": "Markdown", - "Download attachment": "Download attachment", - "Cloned: '%s'": "Cloned: '%s'", - "The cloned file '%s' was attached to this document.": "The cloned file '%s' was attached to this document.", - "Attach a file": "Attach a file", - "alternatively drag & drop a file or paste an image from the clipboard": "alternatively drag & drop a file or paste an image from the clipboard", - "File too large, to display a preview. Please download the attachment.": "File too large, to display a preview. Please download the attachment.", - "Remove attachment": "Remove attachment", - "Your browser does not support uploading encrypted files. Please use a newer browser.": "Your browser does not support uploading encrypted files. Please use a newer browser.", - "Invalid attachment.": "Invalid attachment.", - "Options": "Options", - "Shorten URL": "Shorten URL", - "Editor": "Editor", - "Preview": "Preview", - "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.": "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.", - "Decrypt": "Decrypt", - "Enter password": "Enter password", - "Loading…": "Loading…", - "Decrypting document…": "Decrypting document…", - "Preparing new document…": "Preparing new document…", - "In case this message never disappears please have a look at this FAQ for information to troubleshoot.": "In case this message never disappears please have a look at this FAQ for information to troubleshoot.", - "+++ no document text +++": "+++ no document text +++", - "Could not get document data: %s": "Could not get document data: %s", - "QR code": "QR code", - "This website is using an insecure HTTP connection! Please use it only for testing.": "This website is using an insecure HTTP connection! Please use it only for testing.", - "For more information see this FAQ entry.": "For more information see this FAQ entry.", - "Your browser may require an HTTPS connection to support the WebCrypto API. Try switching to HTTPS.": "Your browser may require an HTTPS connection to support the WebCrypto API. Try switching to HTTPS.", - "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.": "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.", - "waiting on user to provide a password": "waiting on user to provide a password", - "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.": "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.", - "Retry": "Retry", - "Showing raw text…": "Showing raw text…", - "Notice:": "Notice:", - "This link will expire after %s.": "This link will expire after %s.", - "This link can only be accessed once, do not use back or refresh button in your browser.": "This link can only be accessed once, do not use back or refresh button in your browser.", - "Link:": "Link:", - "Recipient may become aware of your timezone, convert time to UTC?": "Recipient may become aware of your timezone, convert time to UTC?", - "Use Current Timezone": "Use Current Timezone", - "Convert To UTC": "Convert To UTC", - "Close": "Close", - "Encrypted note on %s": "Encrypted note on %s", - "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.", - "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", - "URL shortener is enabled by default.": "URL shortener is enabled by default.", - "Save document": "Save document", - "Your IP is not authorized to create documents.": "Your IP is not authorized to create documents.", - "Trying to shorten a URL that isn't pointing at our instance.": "Trying to shorten a URL that isn't pointing at our instance.", - "Proxy error: Proxy URL is empty. This can be a configuration issue, like wrong or missing config keys.": "Proxy error: Proxy URL is empty. This can be a configuration issue, like wrong or missing config keys.", - "Proxy error: Error parsing proxy response. This can be a configuration issue, like wrong or missing config keys.": "Proxy error: Error parsing proxy response. This can be a configuration issue, like wrong or missing config keys.", - "Proxy error: Bad response. This can be a configuration issue, like wrong or missing config keys or a temporary outage.": "Proxy error: Bad response. This can be a configuration issue, like wrong or missing config keys or a temporary outage.", - "This secret message can only be displayed once. Would you like to see it now?": "This secret message can only be displayed once. Would you like to see it now?", - "Yes, see it": "Yes, see it", + "Download attachment": "Ladda ned bilaga", + "Cloned: '%s'": "Klonad: '%s'", + "The cloned file '%s' was attached to this document.": "Den klonade filen '%s' bifogades till detta dokument.", + "Attach a file": "Bifoga en fil", + "alternatively drag & drop a file or paste an image from the clipboard": "alternativt dra och släpp en fil eller klistra in en bild från urklipp", + "File too large, to display a preview. Please download the attachment.": "Filen är för stor för att visa en förhandsvisning. Ladda ned bilagan.", + "Remove attachment": "Ta bort bilaga", + "Your browser does not support uploading encrypted files. Please use a newer browser.": "Din webbläsare stöder inte uppladdning av krypterade filer. Använd en nyare webbläsare.", + "Invalid attachment.": "Ogiltig bilaga.", + "Options": "Alternativ", + "Shorten URL": "Förkorta URL", + "Editor": "Redigerare", + "Preview": "Förhandsvisning", + "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.": "%s kräver att sökvägen slutar med \\\"%s\\\". Uppdatera sökvägen i din index.php.", + "Decrypt": "Dekryptera", + "Enter password": "Ange lösenord", + "Loading…": "Läser in...", + "Decrypting document…": "Dekrypterar dokument…", + "Preparing new document…": "Förbereder nytt dokument…", + "In case this message never disappears please have a look at this FAQ for information to troubleshoot.": "Om detta meddelande inte försvinner, se denna FAQ för felsökning.", + "+++ no document text +++": "+++ ingen dokumenttext +++", + "Could not get document data: %s": "Kunde inte hämta dokumentdata: %s", + "QR code": "QR-kod", + "This website is using an insecure HTTP connection! Please use it only for testing.": "Denna webbplats använder en osäker HTTP-anslutning! Använd den endast för testning.", + "For more information see this FAQ entry.": "För mer information se denna FAQ-post.", + "Your browser may require an HTTPS connection to support the WebCrypto API. Try switching to HTTPS.": "Din webbläsare kan kräva en HTTPS-anslutning för att stödja WebCrypto-API:t. Försök byta till HTTPS.", + "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.": "Din webbläsare stöder inte WebAssembly, som används för zlib-komprimering. Du kan skapa okomprimerade dokument, men kan inte läsa komprimerade.", + "waiting on user to provide a password": "väntar på att användaren anger ett lösenord", + "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.": "Kunde inte dekryptera data. Angav du fel lösenord? Försök igen med knappen högst upp.", + "Retry": "Försök igen", + "Showing raw text…": "Visar råtext…", + "Notice:": "Observera:", + "This link will expire after %s.": "Denna länk upphör efter %s.", + "This link can only be accessed once, do not use back or refresh button in your browser.": "Denna länk kan endast öppnas en gång, använd inte tillbaka- eller uppdatera-knappen i din webbläsare.", + "Link:": "Länk:", + "Recipient may become aware of your timezone, convert time to UTC?": "Mottagaren kan se din tidszon, konvertera tiden till UTC?", + "Use Current Timezone": "Använd aktuell tidszon", + "Convert To UTC": "Konvertera till UTC", + "Close": "Stäng", + "Encrypted note on %s": "Krypterad anteckning på %s", + "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Besök denna länk för att se anteckningen. Ger du URL:en till någon kan de också få tillgång till den.", + "URL shortener may expose your decrypt key in URL.": "URL-förkortare kan avslöja din dekrypteringsnyckel i URL:en.", + "URL shortener is enabled by default.": "URL-förkortare är aktiverad som standard.", + "Save document": "Spara dokument", + "Your IP is not authorized to create documents.": "Din IP-adress är inte auktoriserad att skapa dokument.", + "Trying to shorten a URL that isn't pointing at our instance.": "Försöker förkorta en URL som inte pekar på vår instans.", + "Proxy error: Proxy URL is empty. This can be a configuration issue, like wrong or missing config keys.": "Proxyfel: Proxy-URL är tom. Detta kan vara ett konfigurationsfel, t.ex. felaktiga eller saknade nycklar.", + "Proxy error: Error parsing proxy response. This can be a configuration issue, like wrong or missing config keys.": "Proxyfel: Fel vid tolkning av proxy-svar. Detta kan vara ett konfigurationsfel, t.ex. felaktiga eller saknade nycklar.", + "Proxy error: Bad response. This can be a configuration issue, like wrong or missing config keys or a temporary outage.": "Proxyfel: Felaktigt svar. Detta kan vara ett konfigurationsproblem, t.ex. fel eller saknade nycklar, eller ett tillfälligt avbrott.", + "This secret message can only be displayed once. Would you like to see it now?": "Detta hemliga meddelande kan bara visas en gång. Vill du se det nu?", + "Yes, see it": "Ja, visa", "Dark Mode": "Mörkt Läge", - "Error compressing document, due to missing WebAssembly support.": "Error compressing document, due to missing WebAssembly support.", - "Error decompressing document, your browser does not support WebAssembly. Please use another browser to view this document.": "Error decompressing document, your browser does not support WebAssembly. Please use another browser to view this document.", - "Start over": "Start over", - "Document copied to clipboard": "Document copied to clipboard", - "To copy document press on the copy button or use the clipboard shortcut Ctrl+c/Cmd+c": "To copy document press on the copy button or use the clipboard shortcut Ctrl+c/Cmd+c", - "Copy link": "Copy link", - "Link copied to clipboard": "Link copied to clipboard", - "Document text": "Document text", - "Tabulator key serves as character (Hit Ctrl+m or Esc to toggle)": "Tabulator key serves as character (Hit Ctrl+m or Esc to toggle)", - "Show password": "Show password", - "Hide password": "Hide password", - "Theme": "Theme" + "Error compressing document, due to missing WebAssembly support.": "Fel vid komprimering av dokumentet på grund av saknat stöd för WebAssembly.", + "Error decompressing document, your browser does not support WebAssembly. Please use another browser to view this document.": "Fel vid dekomprimering av dokumentet, din webbläsare stöder inte WebAssembly. Använd en annan webbläsare för att visa detta dokument.", + "Start over": "Börja om", + "Document copied to clipboard": "Dokument kopierat till urklipp", + "To copy document press on the copy button or use the clipboard shortcut Ctrl+c/Cmd+c": "För att kopiera dokumentet, klicka på kopieringsknappen eller använd kortkommandot Ctrl+c/Cmd+c", + "Copy link": "Kopiera länk", + "Link copied to clipboard": "Länk kopierad till urklipp", + "Document text": "Dokumenttext", + "Tabulator key serves as character (Hit Ctrl+m or Esc to toggle)": "Tabb-tangenten fungerar som tecken (Tryck Ctrl+m eller Esc för att växla)", + "Show password": "Visa lösenord", + "Hide password": "Dölj lösenord", + "Theme": "Tema" } diff --git a/js/package-lock.json b/js/package-lock.json index 80b713d3..c06d5bf8 100644 --- a/js/package-lock.json +++ b/js/package-lock.json @@ -1,12 +1,12 @@ { "name": "privatebin", - "version": "2.0.0", + "version": "2.0.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "privatebin", - "version": "2.0.0", + "version": "2.0.3", "license": "zlib-acknowledgement", "devDependencies": { "@peculiar/webcrypto": "^1.5.0", @@ -1275,11 +1275,10 @@ "license": "ISC" }, "node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz", + "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==", "dev": true, - "license": "MIT", "dependencies": { "argparse": "^2.0.1" }, @@ -2785,9 +2784,9 @@ "dev": true }, "js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz", + "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==", "dev": true, "requires": { "argparse": "^2.0.1" diff --git a/js/package.json b/js/package.json index c9af5ad2..8e1bb434 100644 --- a/js/package.json +++ b/js/package.json @@ -1,6 +1,6 @@ { "name": "privatebin", - "version": "2.0.2", + "version": "2.0.3", "description": "PrivateBin is a minimalist, open source online pastebin where the server has zero knowledge of stored data. Data is encrypted/decrypted in the browser using 256 bit AES in Galois Counter mode (GCM).", "main": "privatebin.js", "directories": { diff --git a/js/privatebin.js b/js/privatebin.js index 9bbc39bc..a6cdfd6e 100644 --- a/js/privatebin.js +++ b/js/privatebin.js @@ -671,7 +671,7 @@ jQuery.PrivateBin = (function($) { * @prop {string[]} * @readonly */ - const supportedLanguages = ['ar', 'bg', 'ca', 'co', 'cs', 'de', 'el', 'es', 'et', 'fi', 'fr', 'he', 'hu', 'id', 'it', 'ja', 'jbo', 'lt', 'no', 'nl', 'pl', 'pt', 'oc', 'ro', 'ru', 'sk', 'sl', 'th', 'tr', 'uk', 'zh']; + const supportedLanguages = ['ar', 'bg', 'ca', 'co', 'cs', 'de', 'el', 'es', 'et', 'fi', 'fr', 'he', 'hu', 'id', 'it', 'ja', 'jbo', 'lt', 'no', 'nl', 'pl', 'pt', 'oc', 'ro', 'ru', 'sk', 'sl', 'sv', 'th', 'tr', 'uk', 'zh']; /** * built in language @@ -887,7 +887,7 @@ jQuery.PrivateBin = (function($) { return n % 10 === 1 && n % 100 !== 11 ? 0 : (n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 10 || n % 100 >= 20) ? 1 : 2); case 'sl': return n % 100 === 1 ? 1 : (n % 100 === 2 ? 2 : (n % 100 === 3 || n % 100 === 4 ? 3 : 0)); - // bg, ca, de, el, en, es, et, fi, hu, it, nl, no, pt + // bg, ca, de, el, en, es, et, fi, hu, it, nl, no, pt, sv default: return n !== 1 ? 1 : 0; } @@ -3086,10 +3086,15 @@ jQuery.PrivateBin = (function($) { * @name AttachmentViewer.printDragAndDropFileNames * @private * @function - * @param {array} fileNames + * @param {string[]} fileNames */ function printDragAndDropFileNames(fileNames) { - $dragAndDropFileNames.html(fileNames.join('
')); + $dragAndDropFileNames.empty(); + fileNames.forEach(fileName => { + const name = document.createTextNode(fileName); + $dragAndDropFileNames[0].appendChild(name); + $dragAndDropFileNames[0].appendChild(document.createElement('br')); + }); } /** @@ -3394,19 +3399,21 @@ jQuery.PrivateBin = (function($) { * @function */ function addClipboardEventHandler() { - $('#message').on('paste', function (event) { + document.addEventListener('paste', (event) => { const items = (event.clipboardData || event.originalEvent.clipboardData).items; const files = [...items] .filter(item => item.kind === 'file') .map(item => item.getAsFile()); - if (TopNav.isAttachmentReadonly()) { + if (TopNav.isAttachmentReadonly() && files.length) { event.stopPropagation(); event.preventDefault(); return false; } - readFileData(files); + if (files.length) { + readFileData(files); + } }); } @@ -4625,7 +4632,11 @@ jQuery.PrivateBin = (function($) { */ me.setFormat = function(format) { - $formatter.parent().find(`a[data-format="${format}"]`).click(); + if (Helper.isBootstrap5()) { + $formatter.find('select').val(format); + } else { + $formatter.parent().find(`a[data-format="${format}"]`).click(); + } } /** @@ -5214,22 +5225,23 @@ jQuery.PrivateBin = (function($) { cipherMessage['attachment'] = attachments.map(attachment => attachment[0]); cipherMessage['attachment_name'] = attachments.map(attachment => attachment[1]); - cipherMessage['attachment'] = await Promise.all(cipherMessage['attachment'].map(async (attachment) => { + cipherMessage['attachment'] = await Promise.all(cipherMessage['attachment'].map(async (attachment, i) => { // we need to retrieve data from blob if browser already parsed it in memory if (typeof attachment === 'string' && attachment.startsWith('blob:')) { Alert.showStatus( [ 'Retrieving cloned file \'%s\' from memory...', - attachment[1] + cipherMessage['attachment_name'][i] ], 'copy' ); try { const blobData = await $.ajax({ type: 'GET', - url: `${attachment}`, + url: attachment, processData: false, timeout: 10000, + dataType: 'binary', xhrFields: { withCredentials: false, responseType: 'blob' @@ -5784,6 +5796,10 @@ jQuery.PrivateBin = (function($) { AttachmentViewer.removeAttachment(); TopNav.resetInput(); + // reset format + PasteViewer.setFormat('plaintext'); + TopNav.setFormat('plaintext'); + TopNav.showCreateButtons(); // newPaste could be called when user is on document clone editing view diff --git a/lib/Configuration.php b/lib/Configuration.php index 6ad8c546..66d98419 100644 --- a/lib/Configuration.php +++ b/lib/Configuration.php @@ -12,6 +12,7 @@ namespace PrivateBin; use Exception; +use PrivateBin\Exception\TranslatedException; /** * Configuration @@ -121,7 +122,7 @@ class Configuration 'js/kjua-0.10.0.js' => 'sha512-BYj4xggowR7QD150VLSTRlzH62YPfhpIM+b/1EUEr7RQpdWAGKulxWnOvjFx1FUlba4m6ihpNYuQab51H6XlYg==', 'js/legacy.js' => 'sha512-rGXYUpIqbFoHAgBXZ0UlJBdNAIMOC9EQ67MG0X46D5uRB8LvwzgKirbSQRGdYfk8I2jsUcm+tvHXYboUnC6DUg==', 'js/prettify.js' => 'sha512-puO0Ogy++IoA2Pb9IjSxV1n4+kQkKXYAEUtVzfZpQepyDPyXk8hokiYDS7ybMogYlyyEIwMLpZqVhCkARQWLMg==', - 'js/privatebin.js' => 'sha512-C9Mc6qgEHhaMKC+VzN7Hp8C77HVm8cD5N/AMlP6qkaYj/QLZ0HdtYfOMWrXNn9i83MbqkRD//DnM7bHHEixzIg==', + 'js/privatebin.js' => 'sha512-a8zeCawerrfYBa3x0fiaqZMtR1k9Fd0ZKMl2rhR2M7q25dGHDaoZOzn5xk9AiNHR+Enn7srauqOxnnI1XlooCw==', 'js/purify-3.3.0.js' => 'sha512-lsHD5zxs4lu/NDzaaibe27Vd2t7Cy9JQ3qDHUvDfb4oZvKoWDNEhwUY+4bT3R68cGgpgCYp8U1x2ifeVxqurdQ==', 'js/showdown-2.1.0.js' => 'sha512-WYXZgkTR0u/Y9SVIA4nTTOih0kXMEd8RRV6MLFdL6YU8ymhR528NLlYQt1nlJQbYz4EW+ZsS0fx1awhiQJme1Q==', 'js/zlib-1.3.1-1.js' => 'sha512-5bU9IIP4PgBrOKLZvGWJD4kgfQrkTz8Z3Iqeu058mbQzW3mCumOU6M3UVbVZU9rrVoVwaW4cZK8U8h5xjF88eQ==', @@ -131,7 +132,7 @@ class Configuration /** * parse configuration file and ensure default configuration values are present * - * @throws Exception + * @throws TranslatedException */ public function __construct() { @@ -148,7 +149,8 @@ class Configuration $config = parse_ini_file($configFile, true); foreach (array('main', 'model', 'model_options') as $section) { if (!array_key_exists($section, $config)) { - throw new Exception(I18n::_('PrivateBin requires configuration section [%s] to be present in configuration file.', $section), 2); + $name = $config['main']['name'] ?? self::getDefaults()['main']['name']; + throw new TranslatedException(array('%s requires configuration section [%s] to be present in configuration file.', I18n::_($name), $section), 2); } } break; @@ -158,7 +160,7 @@ class Configuration $opts = '_options'; foreach (self::getDefaults() as $section => $values) { // fill missing sections with default values - if (!array_key_exists($section, $config) || count($config[$section]) == 0) { + if (!array_key_exists($section, $config) || count($config[$section]) === 0) { $this->_configuration[$section] = $values; if (array_key_exists('dir', $this->_configuration[$section])) { $this->_configuration[$section]['dir'] = PATH . $this->_configuration[$section]['dir']; @@ -167,7 +169,7 @@ class Configuration } // provide different defaults for database model elseif ( - $section == 'model_options' && + $section === 'model_options' && $this->_configuration['model']['class'] === 'Database' ) { $values = array( @@ -178,7 +180,7 @@ class Configuration 'opt' => array(), ); } elseif ( - $section == 'model_options' && + $section === 'model_options' && $this->_configuration['model']['class'] === 'GoogleCloudStorage' ) { $values = array( @@ -187,7 +189,7 @@ class Configuration 'uniformacl' => false, ); } elseif ( - $section == 'model_options' && + $section === 'model_options' && $this->_configuration['model']['class'] === 'S3Storage' ) { $values = array( @@ -216,11 +218,11 @@ class Configuration // check for missing keys and set defaults if necessary else { // preserve configured SRI hashes - if ($section == 'sri' && array_key_exists($section, $config)) { + if ($section === 'sri' && array_key_exists($section, $config)) { $this->_configuration[$section] = $config[$section]; } foreach ($values as $key => $val) { - if ($key == 'dir') { + if ($key === 'dir') { $val = PATH . $val; } $result = $val; @@ -304,13 +306,13 @@ class Configuration * get a section from the configuration, must exist * * @param string $section - * @throws Exception + * @throws TranslatedException * @return mixed */ public function getSection($section) { if (!array_key_exists($section, $this->_configuration)) { - throw new Exception(I18n::_('%s requires configuration section [%s] to be present in configuration file.', I18n::_($this->getKey('name')), $section), 3); + throw new TranslatedException(array('%s requires configuration section [%s] to be present in configuration file.', I18n::_($this->getKey('name')), $section), 3); } return $this->_configuration[$section]; } diff --git a/lib/Controller.php b/lib/Controller.php index 3d316687..cef82a61 100644 --- a/lib/Controller.php +++ b/lib/Controller.php @@ -12,6 +12,8 @@ namespace PrivateBin; use Exception; +use PrivateBin\Exception\JsonException; +use PrivateBin\Exception\TranslatedException; use PrivateBin\Persistence\ServerSalt; use PrivateBin\Persistence\TrafficLimiter; use PrivateBin\Proxy\AbstractProxy; @@ -30,7 +32,7 @@ class Controller * * @const string */ - const VERSION = '2.0.2'; + const VERSION = '2.0.3'; /** * minimal required PHP version @@ -195,13 +197,14 @@ class Controller * Set default language * * @access private + * @throws Exception */ private function _setDefaultLanguage() { $lang = $this->_conf->getKey('languagedefault'); I18n::setLanguageFallback($lang); // force default language, if language selection is disabled and a default is set - if (!$this->_conf->getKey('languageselection') && strlen($lang) == 2) { + if (!$this->_conf->getKey('languageselection') && strlen($lang) === 2) { $_COOKIE['lang'] = $lang; setcookie('lang', $lang, array('SameSite' => 'Lax', 'Secure' => true)); } @@ -211,18 +214,23 @@ class Controller * Set default template * * @access private + * @throws Exception */ private function _setDefaultTemplate() { $templates = $this->_conf->getKey('availabletemplates'); $template = $this->_conf->getKey('template'); + if (!in_array($template, $templates, true)) { + $templates[] = $template; + } TemplateSwitcher::setAvailableTemplates($templates); TemplateSwitcher::setTemplateFallback($template); - // force default template, if template selection is disabled and a default is set - if (!$this->_conf->getKey('templateselection') && !empty($template)) { - $_COOKIE['template'] = $template; - setcookie('template', $template, array('SameSite' => 'Lax', 'Secure' => true)); + // force default template, if template selection is disabled + if (!$this->_conf->getKey('templateselection') && array_key_exists('template', $_COOKIE)) { + unset($_COOKIE['template']); // ensure value is not re-used in template switcher + $expiredInAllTimezones = time() - 86400; + setcookie('template', '', array('expires' => $expiredInAllTimezones, 'SameSite' => 'Lax', 'Secure' => true)); } } @@ -256,6 +264,7 @@ class Controller * pasteid (optional) = in discussions, which paste this comment belongs to. * * @access private + * @throws Exception * @return string */ private function _create() @@ -266,8 +275,8 @@ class Controller TrafficLimiter::setStore($this->_model->getStore()); try { TrafficLimiter::canPass(); - } catch (Exception $e) { - $this->_return_message(1, $e->getMessage()); + } catch (TranslatedException $e) { + $this->_json_error($e->getMessage()); return; } @@ -277,14 +286,13 @@ class Controller array_key_exists('parentid', $data) && !empty($data['parentid']); if (!FormatV2::isValid($data, $isComment)) { - $this->_return_message(1, I18n::_('Invalid data.')); + $this->_json_error(I18n::_('Invalid data.')); return; } $sizelimit = $this->_conf->getKey('sizelimit'); // Ensure content is not too big. if (strlen($data['ct']) > $sizelimit) { - $this->_return_message( - 1, + $this->_json_error( I18n::_( 'Document is limited to %s of encrypted data.', Filter::formatHumanReadableSize($sizelimit) @@ -301,34 +309,25 @@ class Controller $comment = $paste->getComment($data['parentid']); $comment->setData($data); $comment->store(); + $this->_json_result($comment->getId()); } catch (Exception $e) { - $this->_return_message(1, $e->getMessage()); - return; + $this->_json_error($e->getMessage()); } - $this->_return_message(0, $comment->getId()); } else { - $this->_return_message(1, I18n::_('Invalid data.')); + $this->_json_error(I18n::_('Invalid data.')); } } // The user posts a standard paste. else { try { $this->_model->purge(); - } catch (Exception $e) { - error_log('Error purging documents: ' . $e->getMessage() . PHP_EOL . - 'Use the administration scripts statistics to find ' . - 'damaged paste IDs and either delete them or restore them ' . - 'from backup.'); - } - $paste = $this->_model->getPaste(); - try { + $paste = $this->_model->getPaste(); $paste->setData($data); $paste->store(); + $this->_json_result($paste->getId(), array('deletetoken' => $paste->getDeleteToken())); } catch (Exception $e) { - $this->_return_message(1, $e->getMessage()); - return; + $this->_json_error($e->getMessage()); } - $this->_return_message(0, $paste->getId(), array('deletetoken' => $paste->getDeleteToken())); } } @@ -358,14 +357,14 @@ class Controller } else { $this->_error = self::GENERIC_ERROR; } - } catch (Exception $e) { + } catch (TranslatedException $e) { $this->_error = $e->getMessage(); } if ($this->_request->isJsonApiCall()) { if (empty($this->_error)) { - $this->_return_message(0, $dataid); + $this->_json_result($dataid); } else { - $this->_return_message(1, $this->_error); + $this->_json_error(I18n::_($this->_error)); } } } @@ -389,12 +388,12 @@ class Controller if (array_key_exists('salt', $data['meta'])) { unset($data['meta']['salt']); } - $this->_return_message(0, $dataid, (array) $data); + $this->_json_result($dataid, (array) $data); } else { - $this->_return_message(1, self::GENERIC_ERROR); + $this->_json_error(I18n::_(self::GENERIC_ERROR)); } - } catch (Exception $e) { - $this->_return_message(1, $e->getMessage()); + } catch (TranslatedException $e) { + $this->_json_error($e->getMessage()); } } @@ -402,6 +401,7 @@ class Controller * Display frontend. * * @access private + * @throws Exception */ private function _view() { @@ -421,7 +421,7 @@ class Controller // label all the expiration options $expire = array(); foreach ($this->_conf->getSection('expire_options') as $time => $seconds) { - $expire[$time] = ($seconds == 0) ? I18n::_(ucfirst($time)) : Filter::formatHumanReadableTime($time); + $expire[$time] = ($seconds === 0) ? I18n::_(ucfirst($time)) : Filter::formatHumanReadableTime($time); } // translate all the formatter options @@ -462,7 +462,7 @@ class Controller } $page->assign('BASEPATH', I18n::_($this->_conf->getKey('basepath'))); $page->assign('STATUS', I18n::_($this->_status)); - $page->assign('ISDELETED', I18n::_(json_encode($this->_is_deleted))); + $page->assign('ISDELETED', $this->_is_deleted); $page->assign('VERSION', self::VERSION); $page->assign('DISCUSSION', $this->_conf->getKey('discussion')); $page->assign('OPENDISCUSSION', $this->_conf->getKey('opendiscussion')); @@ -533,6 +533,40 @@ class Controller echo $content; } + /** + * prepares JSON encoded error message + * + * @access private + * @param string $error + * @throws JsonException + */ + private function _json_error($error) + { + $result = array( + 'status' => 1, + 'message' => $error, + ); + $this->_json = Json::encode($result); + } + + /** + * prepares JSON encoded result message + * + * @access private + * @param string $dataid + * @param array $other + * @throws JsonException + */ + private function _json_result($dataid, $other = array()) + { + $result = array( + 'status' => 0, + 'id' => $dataid, + 'url' => $this->_urlBase . '?' . $dataid, + ) + $other; + $this->_json = Json::encode($result); + } + /** * Proxies a link using the specified proxy class, and updates the status or error with the response. * @@ -547,25 +581,4 @@ class Controller $this->_status = $proxy->getUrl(); } } - - /** - * prepares JSON encoded status message - * - * @access private - * @param int $status - * @param string $message - * @param array $other - */ - private function _return_message($status, $message, $other = array()) - { - $result = array('status' => $status); - if ($status) { - $result['message'] = I18n::_($message); - } else { - $result['id'] = $message; - $result['url'] = $this->_urlBase . '?' . $message; - } - $result += $other; - $this->_json = Json::encode($result); - } } diff --git a/lib/Data/Database.php b/lib/Data/Database.php index 0fd42dcc..61c6ec77 100644 --- a/lib/Data/Database.php +++ b/lib/Data/Database.php @@ -15,6 +15,7 @@ use Exception; use PDO; use PDOException; use PrivateBin\Controller; +use PrivateBin\Exception\JsonException; use PrivateBin\Json; /** @@ -83,8 +84,13 @@ class Database extends AbstractData ); // MySQL uses backticks to quote identifiers by default, // tell it to expect ANSI SQL double quotes - if ($this->_type === 'mysql' && defined('PDO::MYSQL_ATTR_INIT_COMMAND')) { - $options['opt'][PDO::MYSQL_ATTR_INIT_COMMAND] = "SET SESSION sql_mode='ANSI_QUOTES'"; + if ($this->_type === 'mysql') { + // deprecated as of PHP 8.5 + if (version_compare(PHP_VERSION, '8.5') < 0 && defined('PDO::MYSQL_ATTR_INIT_COMMAND')) { + $options['opt'][PDO::MYSQL_ATTR_INIT_COMMAND] = "SET SESSION sql_mode='ANSI_QUOTES'"; + } elseif (defined('Pdo\Mysql::ATTR_INIT_COMMAND')) { + $options['opt'][Pdo\Mysql::ATTR_INIT_COMMAND] = "SET SESSION sql_mode='ANSI_QUOTES'"; + } } $tableQuery = $this->_getTableQuery($this->_type); $this->_db = new PDO( @@ -179,18 +185,24 @@ class Database extends AbstractData 'SELECT * FROM "' . $this->_sanitizeIdentifier('paste') . '" WHERE "dataid" = ?', array($pasteid), true ); - } catch (Exception $e) { + } catch (PDOException $e) { $row = false; } if ($row === false) { return false; } // create array - $paste = Json::decode($row['data']); + try { + $paste = Json::decode($row['data']); + } catch (JsonException $e) { + error_log('Error while reading a paste from the database: ' . $e->getMessage()); + $paste = array(); + } try { $paste['meta'] = Json::decode($row['meta']); - } catch (Exception $e) { + } catch (JsonException $e) { + error_log('Error while reading a paste from the database: ' . $e->getMessage()); $paste['meta'] = array(); } $expire_date = (int) $row['expiredate']; @@ -233,7 +245,7 @@ class Database extends AbstractData 'SELECT "dataid" FROM "' . $this->_sanitizeIdentifier('paste') . '" WHERE "dataid" = ?', array($pasteid), true ); - } catch (Exception $e) { + } catch (PDOException $e) { return false; } return (bool) $row; @@ -253,7 +265,7 @@ class Database extends AbstractData { try { $data = Json::encode($comment); - } catch (Exception $e) { + } catch (JsonException $e) { error_log('Error while attempting to insert a comment into the database: ' . $e->getMessage()); return false; } @@ -274,7 +286,7 @@ class Database extends AbstractData $meta['created'], ) ); - } catch (Exception $e) { + } catch (PDOException $e) { error_log('Error while attempting to insert a comment into the database: ' . $e->getMessage()); return false; } @@ -298,8 +310,14 @@ class Database extends AbstractData $comments = array(); if (count($rows)) { foreach ($rows as $row) { + try { + $data = Json::decode($row['data']); + } catch (JsonException $e) { + error_log('Error while reading a comment from the database: ' . $e->getMessage()); + $data = array(); + } $i = $this->getOpenSlot($comments, (int) $row['postdate']); - $comments[$i] = Json::decode($row['data']); + $comments[$i] = $data; $comments[$i]['id'] = $row['dataid']; $comments[$i]['parentid'] = $row['parentid']; $comments[$i]['meta'] = array('created' => (int) $row['postdate']); @@ -329,7 +347,7 @@ class Database extends AbstractData '" WHERE "pasteid" = ? AND "parentid" = ? AND "dataid" = ?', array($pasteid, $parentid, $commentid), true ); - } catch (Exception $e) { + } catch (PDOException $e) { return false; } } @@ -349,7 +367,8 @@ class Database extends AbstractData $this->_last_cache[$key] = $value; try { $value = Json::encode($this->_last_cache); - } catch (Exception $e) { + } catch (JsonException $e) { + error_log('Error encoding JSON for table "config", row "traffic_limiter": ' . $e->getMessage()); return false; } } @@ -386,14 +405,17 @@ class Database extends AbstractData $fs = new Filesystem(array('dir' => 'data')); $value = $fs->getValue('salt'); $this->setValue($value, 'salt'); - unlink($file); + if (!unlink($file)) { + error_log('Error deleting migrated salt: ' . $file); + } return $value; } } if ($value && $namespace === 'traffic_limiter') { try { $this->_last_cache = Json::decode($value); - } catch (Exception $e) { + } catch (JsonException $e) { + error_log('Error decoding JSON from table "config", row "traffic_limiter": ' . $e->getMessage()); $this->_last_cache = array(); } if (array_key_exists($key, $this->_last_cache)) { @@ -412,13 +434,18 @@ class Database extends AbstractData */ protected function _getExpiredPastes($batchsize) { - $statement = $this->_db->prepare( - 'SELECT "dataid" FROM "' . $this->_sanitizeIdentifier('paste') . - '" WHERE "expiredate" < ? AND "expiredate" != ? ' . - ($this->_type === 'oci' ? 'FETCH NEXT ? ROWS ONLY' : 'LIMIT ?') - ); - $statement->execute(array(time(), 0, $batchsize)); - return $statement->fetchAll(PDO::FETCH_COLUMN, 0); + try { + $statement = $this->_db->prepare( + 'SELECT "dataid" FROM "' . $this->_sanitizeIdentifier('paste') . + '" WHERE "expiredate" < ? AND "expiredate" != ? ' . + ($this->_type === 'oci' ? 'FETCH NEXT ? ROWS ONLY' : 'LIMIT ?') + ); + $statement->execute(array(time(), 0, $batchsize)); + return $statement->fetchAll(PDO::FETCH_COLUMN, 0); + } catch (PDOException $e) { + error_log('Error while attempting to find expired pastes in the database: ' . $e->getMessage()); + return array(); + } } /** @@ -552,6 +579,7 @@ class Database extends AbstractData '" WHERE "id" = ?', array($key), true ); } catch (PDOException $e) { + error_log('Error while attempting to fetch configuration key "' . $key . '" in the database: ' . $e->getMessage()); return ''; } return $row ? $row['value'] : ''; diff --git a/lib/Data/Filesystem.php b/lib/Data/Filesystem.php index e4377a9f..8dbaa9d2 100644 --- a/lib/Data/Filesystem.php +++ b/lib/Data/Filesystem.php @@ -11,8 +11,9 @@ namespace PrivateBin\Data; -use Exception; +use DirectoryIterator; use GlobIterator; +use PrivateBin\Exception\JsonException; use PrivateBin\Json; /** @@ -104,13 +105,10 @@ class Filesystem extends AbstractData */ public function read($pasteid) { - if ( - !$this->exists($pasteid) || - !$paste = $this->_get($this->_dataid2path($pasteid) . $pasteid . '.php') - ) { - return false; + if ($this->exists($pasteid)) { + return $this->_get($this->_dataid2path($pasteid) . $pasteid . '.php'); } - return $paste; + return false; } /** @@ -124,21 +122,24 @@ class Filesystem extends AbstractData $pastedir = $this->_dataid2path($pasteid); if (is_dir($pastedir)) { // Delete the paste itself. - if (is_file($pastedir . $pasteid . '.php')) { - unlink($pastedir . $pasteid . '.php'); + $pastefile = $pastedir . $pasteid . '.php'; + if (is_file($pastefile)) { + if (!unlink($pastefile)) { + error_log('Error deleting paste: ' . $pastefile); + } } // Delete discussion if it exists. $discdir = $this->_dataid2discussionpath($pasteid); if (is_dir($discdir)) { // Delete all files in discussion directory - $dir = dir($discdir); - while (false !== ($filename = $dir->read())) { - if (is_file($discdir . $filename)) { - unlink($discdir . $filename); + foreach (new DirectoryIterator($discdir) as $file) { + if ($file->isFile()) { + if (!unlink($file->getPathname())) { + error_log('Error deleting comment: ' . $file->getPathname()); + } } } - $dir->close(); rmdir($discdir); } } @@ -162,14 +163,11 @@ class Filesystem extends AbstractData // convert comments, too $discdir = $this->_dataid2discussionpath($pasteid); if (is_dir($discdir)) { - $dir = dir($discdir); - while (false !== ($filename = $dir->read())) { - if (substr($filename, -4) !== '.php' && strlen($filename) >= 16) { - $commentFilename = $discdir . $filename . '.php'; - $this->_prependRename($discdir . $filename, $commentFilename); + foreach (new DirectoryIterator($discdir) as $file) { + if ($file->getExtension() !== 'php' && strlen($file->getFilename()) >= 16) { + $this->_prependRename($file->getPathname(), $file->getPathname() . '.php'); } } - $dir->close(); } } return is_readable($pastePath); @@ -210,15 +208,14 @@ class Filesystem extends AbstractData $comments = array(); $discdir = $this->_dataid2discussionpath($pasteid); if (is_dir($discdir)) { - $dir = dir($discdir); - while (false !== ($filename = $dir->read())) { + foreach (new DirectoryIterator($discdir) as $file) { // Filename is in the form pasteid.commentid.parentid.php: // - pasteid is the paste this reply belongs to. // - commentid is the comment identifier itself. // - parentid is the comment this comment replies to (It can be pasteid) - if (is_file($discdir . $filename)) { - $comment = $this->_get($discdir . $filename); - $items = explode('.', $filename); + if ($file->isFile()) { + $comment = $this->_get($file->getPathname()); + $items = explode('.', $file->getBasename('.php')); // Add some meta information not contained in file. $comment['id'] = $items[1]; $comment['parentid'] = $items[2]; @@ -231,7 +228,6 @@ class Filesystem extends AbstractData $comments[$key] = $comment; } } - $dir->close(); // Sort comments by date, oldest first. ksort($comments); @@ -312,7 +308,7 @@ class Filesystem extends AbstractData $file = $this->_path . DIRECTORY_SEPARATOR . 'salt.php'; if (is_readable($file)) { $items = explode('|', file_get_contents($file)); - if (count($items) == 3) { + if (count($items) === 3) { return $items[1]; } } @@ -346,7 +342,12 @@ class Filesystem extends AbstractData file_get_contents($filename), strlen(self::PROTECTION_LINE . PHP_EOL) ); - return Json::decode($data); + try { + return Json::decode($data); + } catch (JsonException $e) { + error_log('Error decoding JSON from "' . $filename . '": ' . $e->getMessage()); + return false; + } } /** @@ -368,10 +369,7 @@ class Filesystem extends AbstractData foreach ($files as $pasteid) { if ($this->exists($pasteid)) { $data = $this->read($pasteid); - if ( - array_key_exists('expire_date', $data['meta']) && - $data['meta']['expire_date'] < $time - ) { + if (($data['meta']['expire_date'] ?? $time) < $time) { $pastes[] = $pasteid; if (++$count >= $batchsize) { break; @@ -450,7 +448,7 @@ class Filesystem extends AbstractData $filename, self::PROTECTION_LINE . PHP_EOL . Json::encode($data) ); - } catch (Exception $e) { + } catch (JsonException $e) { error_log('Error while trying to store data to the filesystem at path "' . $filename . '": ' . $e->getMessage()); return false; } @@ -523,6 +521,8 @@ class Filesystem extends AbstractData file_put_contents($destFile, $handle, FILE_APPEND); fclose($handle); } - unlink($srcFile); + if (!unlink($srcFile)) { + error_log('Error deleting converted document: ' . $srcFile); + } } } diff --git a/lib/Data/GoogleCloudStorage.php b/lib/Data/GoogleCloudStorage.php index 9f64abe5..971825c5 100644 --- a/lib/Data/GoogleCloudStorage.php +++ b/lib/Data/GoogleCloudStorage.php @@ -15,6 +15,7 @@ use Exception; use Google\Cloud\Core\Exception\NotFoundException; use Google\Cloud\Storage\Bucket; use Google\Cloud\Storage\StorageClient; +use PrivateBin\Exception\JsonException; use PrivateBin\Json; class GoogleCloudStorage extends AbstractData @@ -89,7 +90,7 @@ class GoogleCloudStorage extends AbstractData */ private function _getKey($pasteid) { - if ($this->_prefix != '') { + if (!empty($this->_prefix)) { return $this->_prefix . '/' . $pasteid; } return $pasteid; @@ -106,7 +107,7 @@ class GoogleCloudStorage extends AbstractData */ private function _upload($key, &$payload) { - $metadata = array_key_exists('meta', $payload) ? $payload['meta'] : array(); + $metadata = $payload['meta'] ?? array(); unset($metadata['salt']); foreach ($metadata as $k => $v) { $metadata[$k] = strval($v); @@ -219,7 +220,12 @@ class GoogleCloudStorage extends AbstractData try { foreach ($this->_bucket->objects(array('prefix' => $prefix)) as $key) { $data = $this->_bucket->object($key->name())->downloadAsString(); - $comment = Json::decode($data); + try { + $comment = Json::decode($data); + } catch (JsonException $e) { + error_log('failed to read comment from ' . $key->name() . ', ' . $e->getMessage()); + $comment = array(); + } $comment['id'] = basename($key->name()); $slot = $this->getOpenSlot($comments, (int) $comment['meta']['created']); $comments[$slot] = $comment; @@ -252,15 +258,12 @@ class GoogleCloudStorage extends AbstractData if (strlen($name) > strlen($path) && substr($name, strlen($path), 1) !== '/') { continue; } - $info = $object->info(); - if (key_exists('metadata', $info) && key_exists('value', $info['metadata'])) { - $value = $info['metadata']['value']; - if (is_numeric($value) && intval($value) < $time) { - try { - $object->delete(); - } catch (NotFoundException $e) { - // deleted by another instance. - } + $value = $object->info()['metadata']['value'] ?? ''; + if (is_numeric($value) && intval($value) < $time) { + try { + $object->delete(); + } catch (NotFoundException $e) { + // deleted by another instance. } } } @@ -276,14 +279,14 @@ class GoogleCloudStorage extends AbstractData */ public function setValue($value, $namespace, $key = '') { - if ($key === '') { + if (empty($key)) { $key = 'config/' . $namespace; } else { $key = 'config/' . $namespace . '/' . $key; } $metadata = array('namespace' => $namespace); - if ($namespace != 'salt') { + if ($namespace !== 'salt') { $metadata['value'] = strval($value); } try { @@ -334,17 +337,14 @@ class GoogleCloudStorage extends AbstractData $now = time(); $prefix = $this->_prefix; - if ($prefix != '') { + if (!empty($prefix)) { $prefix .= '/'; } try { foreach ($this->_bucket->objects(array('prefix' => $prefix)) as $object) { - $metadata = $object->info()['metadata']; - if ($metadata != null && array_key_exists('expire_date', $metadata)) { - $expire_at = intval($metadata['expire_date']); - if ($expire_at != 0 && $expire_at < $now) { - array_push($expired, basename($object->name())); - } + $expire_at = $object->info()['metadata']['expire_date'] ?? ''; + if (is_numeric($expire_at) && intval($expire_at) < $now) { + array_push($expired, basename($object->name())); } if (count($expired) > $batchsize) { @@ -364,7 +364,7 @@ class GoogleCloudStorage extends AbstractData { $pastes = array(); $prefix = $this->_prefix; - if ($prefix != '') { + if (!empty($prefix)) { $prefix .= '/'; } diff --git a/lib/Data/S3Storage.php b/lib/Data/S3Storage.php index 526a9ec2..ccaf2526 100644 --- a/lib/Data/S3Storage.php +++ b/lib/Data/S3Storage.php @@ -37,6 +37,7 @@ namespace PrivateBin\Data; use Aws\S3\Exception\S3Exception; use Aws\S3\S3Client; +use PrivateBin\Exception\JsonException; use PrivateBin\Json; class S3Storage extends AbstractData @@ -147,7 +148,7 @@ class S3Storage extends AbstractData */ private function _getKey($pasteid) { - if ($this->_prefix != '') { + if (!empty($this->_prefix)) { return $this->_prefix . '/' . $pasteid; } return $pasteid; @@ -164,7 +165,7 @@ class S3Storage extends AbstractData */ private function _upload($key, &$payload) { - $metadata = array_key_exists('meta', $payload) ? $payload['meta'] : array(); + $metadata = $payload['meta'] ?? array(); unset($metadata['salt']); foreach ($metadata as $k => $v) { $metadata[$k] = strval($v); @@ -177,12 +178,14 @@ class S3Storage extends AbstractData 'ContentType' => 'application/json', 'Metadata' => $metadata, )); + return true; } catch (S3Exception $e) { error_log('failed to upload ' . $key . ' to ' . $this->_bucket . ', ' . trim(preg_replace('/\s\s+/', ' ', $e->getMessage()))); - return false; + } catch (JsonException $e) { + error_log('failed to JSON encode ' . $key . ', ' . $e->getMessage()); } - return true; + return false; } /** @@ -212,8 +215,10 @@ class S3Storage extends AbstractData } catch (S3Exception $e) { error_log('failed to read ' . $pasteid . ' from ' . $this->_bucket . ', ' . trim(preg_replace('/\s\s+/', ' ', $e->getMessage()))); - return false; + } catch (JsonException $e) { + error_log('failed to JSON decode ' . $pasteid . ', ' . $e->getMessage()); } + return false; } /** @@ -312,7 +317,7 @@ class S3Storage extends AbstractData public function purgeValues($namespace, $time) { $path = $this->_prefix; - if ($path != '') { + if (!empty($path)) { $path .= '/'; } $path .= 'config/' . $namespace; @@ -327,17 +332,15 @@ class S3Storage extends AbstractData 'Bucket' => $this->_bucket, 'Key' => $name, )); - if ($head->get('Metadata') != null && array_key_exists('value', $head->get('Metadata'))) { - $value = $head->get('Metadata')['value']; - if (is_numeric($value) && intval($value) < $time) { - try { - $this->_client->deleteObject(array( - 'Bucket' => $this->_bucket, - 'Key' => $name, - )); - } catch (S3Exception $e) { - // deleted by another instance. - } + $value = $head->get('Metadata')['value'] ?? ''; + if (is_numeric($value) && intval($value) < $time) { + try { + $this->_client->deleteObject(array( + 'Bucket' => $this->_bucket, + 'Key' => $name, + )); + } catch (S3Exception $e) { + // deleted by another instance. } } } @@ -354,7 +357,7 @@ class S3Storage extends AbstractData public function setValue($value, $namespace, $key = '') { $prefix = $this->_prefix; - if ($prefix != '') { + if (!empty($prefix)) { $prefix .= '/'; } @@ -365,7 +368,7 @@ class S3Storage extends AbstractData } $metadata = array('namespace' => $namespace); - if ($namespace != 'salt') { + if ($namespace !== 'salt') { $metadata['value'] = strval($value); } try { @@ -390,7 +393,7 @@ class S3Storage extends AbstractData public function getValue($namespace, $key = '') { $prefix = $this->_prefix; - if ($prefix != '') { + if (!empty($prefix)) { $prefix .= '/'; } @@ -419,7 +422,7 @@ class S3Storage extends AbstractData $expired = array(); $now = time(); $prefix = $this->_prefix; - if ($prefix != '') { + if (!empty($prefix)) { $prefix .= '/'; } @@ -429,11 +432,9 @@ class S3Storage extends AbstractData 'Bucket' => $this->_bucket, 'Key' => $object['Key'], )); - if ($head->get('Metadata') != null && array_key_exists('expire_date', $head->get('Metadata'))) { - $expire_at = intval($head->get('Metadata')['expire_date']); - if ($expire_at != 0 && $expire_at < $now) { - array_push($expired, $object['Key']); - } + $expire_at = $head->get('Metadata')['expire_date'] ?? ''; + if (is_numeric($expire_at) && intval($expire_at) < $now) { + array_push($expired, $object['Key']); } if (count($expired) > $batchsize) { @@ -453,7 +454,7 @@ class S3Storage extends AbstractData { $pastes = array(); $prefix = $this->_prefix; - if ($prefix != '') { + if (!empty($prefix)) { $prefix .= '/'; } diff --git a/lib/Exception/JsonException.php b/lib/Exception/JsonException.php new file mode 100644 index 00000000..dea5c97f --- /dev/null +++ b/lib/Exception/JsonException.php @@ -0,0 +1,38 @@ +')) { - continue; - } - } elseif (is_int($args[$i])) { + for ($i = 1; $i < $argsCount; ++$i) { + if (is_int($args[$i])) { continue; } $args[$i] = self::encode($args[$i]); @@ -162,6 +161,7 @@ class I18n * * @access public * @static + * @throws JsonException */ public static function loadTranslations() { @@ -172,21 +172,20 @@ class I18n array_key_exists('lang', $_COOKIE) && ($key = array_search($_COOKIE['lang'], $availableLanguages)) !== false ) { - $match = $availableLanguages[$key]; + self::$_language = $availableLanguages[$key]; } // find a translation file matching the browsers language preferences else { - $match = self::_getMatchingLanguage( + self::$_language = self::_getMatchingLanguage( self::getBrowserLanguages(), $availableLanguages ); } // load translations - self::$_language = $match; - if ($match == 'en') { + if (self::$_language === 'en') { self::$_translations = array(); } else { - $data = file_get_contents(self::_getPath($match . '.json')); + $data = file_get_contents(self::_getPath(self::$_language . '.json')); self::$_translations = Json::decode($data); } } @@ -200,14 +199,14 @@ class I18n */ public static function getAvailableLanguages() { - if (count(self::$_availableLanguages) == 0) { + if (count(self::$_availableLanguages) === 0) { self::$_availableLanguages[] = 'en'; // en.json is not part of the release archive $languageIterator = new AppendIterator(); $languageIterator->append(new GlobIterator(self::_getPath('??.json'))); $languageIterator->append(new GlobIterator(self::_getPath('???.json'))); // for jbo foreach ($languageIterator as $file) { $language = $file->getBasename('.json'); - if ($language != 'en') { + if ($language !== 'en') { self::$_availableLanguages[] = $language; } } @@ -270,16 +269,17 @@ class I18n * @access public * @static * @param array $languages + * @throws JsonException * @return array */ public static function getLanguageLabels($languages = array()) { $file = self::_getPath('languages.json'); - if (count(self::$_languageLabels) == 0 && is_readable($file)) { + if (count(self::$_languageLabels) === 0 && is_readable($file)) { $data = file_get_contents($file); self::$_languageLabels = Json::decode($data); } - if (count($languages) == 0) { + if (count($languages) === 0) { return self::$_languageLabels; } return array_intersect_key(self::$_languageLabels, array_flip($languages)); @@ -366,11 +366,11 @@ class I18n return $n === 1 ? 0 : (($n === 0 || ($n % 100 > 0 && $n % 100 < 20)) ? 1 : 2); case 'ru': case 'uk': - return $n % 10 === 1 && $n % 100 != 11 ? 0 : ($n % 10 >= 2 && $n % 10 <= 4 && ($n % 100 < 10 || $n % 100 >= 20) ? 1 : 2); + return $n % 10 === 1 && $n % 100 !== 11 ? 0 : ($n % 10 >= 2 && $n % 10 <= 4 && ($n % 100 < 10 || $n % 100 >= 20) ? 1 : 2); case 'sl': return $n % 100 === 1 ? 1 : ($n % 100 === 2 ? 2 : ($n % 100 === 3 || $n % 100 === 4 ? 3 : 0)); default: - // bg, ca, de, el, en, es, et, fi, hu, it, nl, no, pt + // bg, ca, de, el, en, es, et, fi, hu, it, nl, no, pt, sv return $n !== 1 ? 1 : 0; } } diff --git a/lib/Json.php b/lib/Json.php index cc405575..15453cfa 100644 --- a/lib/Json.php +++ b/lib/Json.php @@ -11,7 +11,7 @@ namespace PrivateBin; -use Exception; +use PrivateBin\Exception\JsonException; /** * Json @@ -26,7 +26,7 @@ class Json * @access public * @static * @param mixed $input - * @throws Exception + * @throws JsonException * @return string */ public static function encode(&$input) @@ -42,7 +42,7 @@ class Json * @access public * @static * @param string $input - * @throws Exception + * @throws JsonException * @return mixed */ public static function decode(&$input) @@ -57,21 +57,14 @@ class Json * * @access private * @static - * @throws Exception + * @throws JsonException * @return void */ private static function _detectError() { $errorCode = json_last_error(); - if ($errorCode === JSON_ERROR_NONE) { - return; + if ($errorCode !== JSON_ERROR_NONE) { + throw new JsonException($errorCode); } - - $message = 'A JSON error occurred'; - if (function_exists('json_last_error_msg')) { - $message .= ': ' . json_last_error_msg(); - } - $message .= ' (' . $errorCode . ')'; - throw new Exception($message, 90); } } diff --git a/lib/Model/AbstractModel.php b/lib/Model/AbstractModel.php index d7b5102f..51c11dfa 100644 --- a/lib/Model/AbstractModel.php +++ b/lib/Model/AbstractModel.php @@ -11,9 +11,9 @@ namespace PrivateBin\Model; -use Exception; use PrivateBin\Configuration; use PrivateBin\Data\AbstractData; +use PrivateBin\Exception\TranslatedException; /** * AbstractModel @@ -22,6 +22,20 @@ use PrivateBin\Data\AbstractData; */ abstract class AbstractModel { + /** + * show the same error message if the data is invalid + * + * @const string + */ + const INVALID_DATA_ERROR = 'Invalid data.'; + + /** + * show the same error message if the document ID already exists + * + * @const string + */ + const COLLISION_ERROR = 'You are unlucky. Try again.'; + /** * Instance ID. * @@ -83,12 +97,12 @@ abstract class AbstractModel * * @access public * @param string $id - * @throws Exception + * @throws TranslatedException */ public function setId($id) { if (!self::isValidId($id)) { - throw new Exception('Invalid document ID.', 60); + throw new TranslatedException('Invalid document ID.', 60); } $this->_id = $id; } @@ -98,7 +112,7 @@ abstract class AbstractModel * * @access public * @param array $data - * @throws Exception + * @throws TranslatedException */ public function setData(array &$data) { @@ -125,7 +139,7 @@ abstract class AbstractModel * Store the instance's data. * * @access public - * @throws Exception + * @throws TranslatedException */ abstract public function store(); @@ -163,7 +177,7 @@ abstract class AbstractModel * * @access protected * @param array $data - * @throws Exception + * @throws TranslatedException */ protected function _validate(array &$data) { diff --git a/lib/Model/Comment.php b/lib/Model/Comment.php index 3c0b2b20..2a55b588 100644 --- a/lib/Model/Comment.php +++ b/lib/Model/Comment.php @@ -11,9 +11,9 @@ namespace PrivateBin\Model; -use Exception; use Identicon\Identicon; use Jdenticon\Identicon as Jdenticon; +use PrivateBin\Exception\TranslatedException; use PrivateBin\Persistence\TrafficLimiter; use PrivateBin\Vizhash16x16; @@ -36,24 +36,24 @@ class Comment extends AbstractModel * Store the comment's data. * * @access public - * @throws Exception + * @throws TranslatedException */ public function store() { // Make sure paste exists. $pasteid = $this->getPaste()->getId(); if (!$this->getPaste()->exists()) { - throw new Exception('Invalid data.', 67); + throw new TranslatedException(self::INVALID_DATA_ERROR, 67); } // Make sure the discussion is opened in this paste and allowed in the configuration. if (!$this->getPaste()->isOpendiscussion() || !$this->_conf->getKey('discussion')) { - throw new Exception('Invalid data.', 68); + throw new TranslatedException(self::INVALID_DATA_ERROR, 68); } // Check for improbable collision. if ($this->exists()) { - throw new Exception('You are unlucky. Try again.', 69); + throw new TranslatedException(self::COLLISION_ERROR, 69); } $this->_data['meta']['created'] = time(); @@ -67,7 +67,7 @@ class Comment extends AbstractModel $this->_data ) === false ) { - throw new Exception('Error saving comment. Sorry.', 70); + throw new TranslatedException('Error saving comment. Sorry.', 70); } } @@ -91,7 +91,6 @@ class Comment extends AbstractModel * * @access public * @param Paste $paste - * @throws Exception */ public function setPaste(Paste &$paste) { @@ -115,12 +114,12 @@ class Comment extends AbstractModel * * @access public * @param string $id - * @throws Exception + * @throws TranslatedException */ public function setParentId($id) { if (!self::isValidId($id)) { - throw new Exception('Invalid document ID.', 65); + throw new TranslatedException('Invalid document ID.', 65); } $this->_data['parentid'] = $id; } @@ -149,13 +148,13 @@ class Comment extends AbstractModel { // we generate an icon based on a SHA512 HMAC of the users IP, if configured $icon = $this->_conf->getKey('icon'); - if ($icon != 'none') { + if ($icon !== 'none') { $pngdata = ''; $hmac = TrafficLimiter::getHash(); - if ($icon == 'identicon') { + if ($icon === 'identicon') { $identicon = new Identicon(); $pngdata = $identicon->getImageDataUri($hmac, 16); - } elseif ($icon == 'jdenticon') { + } elseif ($icon === 'jdenticon') { $jdenticon = new Jdenticon(array( 'hash' => $hmac, 'size' => 16, @@ -165,13 +164,13 @@ class Comment extends AbstractModel ), )); $pngdata = $jdenticon->getImageDataUri('png'); - } elseif ($icon == 'vizhash') { + } elseif ($icon === 'vizhash') { $vh = new Vizhash16x16(); $pngdata = 'data:image/png;base64,' . base64_encode( $vh->generate($hmac) ); } - if ($pngdata != '') { + if (!empty($pngdata)) { if (!array_key_exists('meta', $data)) { $data['meta'] = array(); } diff --git a/lib/Model/Paste.php b/lib/Model/Paste.php index a42ab35e..884b5fb1 100644 --- a/lib/Model/Paste.php +++ b/lib/Model/Paste.php @@ -11,8 +11,8 @@ namespace PrivateBin\Model; -use Exception; use PrivateBin\Controller; +use PrivateBin\Exception\TranslatedException; use PrivateBin\Persistence\ServerSalt; /** @@ -47,14 +47,14 @@ class Paste extends AbstractModel * Get paste data. * * @access public - * @throws Exception + * @throws TranslatedException * @return array */ public function get() { $data = $this->_store->read($this->getId()); if ($data === false) { - throw new Exception(Controller::GENERIC_ERROR, 64); + throw new TranslatedException(Controller::GENERIC_ERROR, 64); } // check if paste has expired and delete it if necessary. @@ -62,7 +62,7 @@ class Paste extends AbstractModel $now = time(); if ($data['meta']['expire_date'] < $now) { $this->delete(); - throw new Exception(Controller::GENERIC_ERROR, 63); + throw new TranslatedException(Controller::GENERIC_ERROR, 63); } // We kindly provide the remaining time before expiration (in seconds) $data['meta']['time_to_live'] = $data['meta']['expire_date'] - $now; @@ -73,10 +73,7 @@ class Paste extends AbstractModel } // check if non-expired burn after reading paste needs to be deleted - if ( - array_key_exists('adata', $data) && - $data['adata'][self::ADATA_BURN_AFTER_READING] === 1 - ) { + if (($data['adata'][self::ADATA_BURN_AFTER_READING] ?? 0) === 1) { $this->delete(); } @@ -93,13 +90,13 @@ class Paste extends AbstractModel * Store the paste's data. * * @access public - * @throws Exception + * @throws TranslatedException */ public function store() { // Check for improbable collision. if ($this->exists()) { - throw new Exception('You are unlucky. Try again.', 75); + throw new TranslatedException(self::COLLISION_ERROR, 75); } $this->_data['meta']['salt'] = ServerSalt::generate(); @@ -111,7 +108,7 @@ class Paste extends AbstractModel $this->_data ) === false ) { - throw new Exception('Error saving document. Sorry.', 76); + throw new TranslatedException('Error saving document. Sorry.', 76); } } @@ -119,7 +116,6 @@ class Paste extends AbstractModel * Delete the paste. * * @access public - * @throws Exception */ public function delete() { @@ -143,18 +139,18 @@ class Paste extends AbstractModel * @access public * @param string $parentId * @param string $commentId - * @throws Exception + * @throws TranslatedException * @return Comment */ public function getComment($parentId, $commentId = '') { if (!$this->exists()) { - throw new Exception('Invalid data.', 62); + throw new TranslatedException(self::INVALID_DATA_ERROR, 62); } $comment = new Comment($this->_conf, $this->_store); $comment->setPaste($this); $comment->setParentId($parentId); - if ($commentId !== '') { + if (!empty($commentId)) { $comment->setId($commentId); } return $comment; @@ -201,7 +197,6 @@ class Paste extends AbstractModel * Check if paste has discussions enabled. * * @access public - * @throws Exception * @return bool */ public function isOpendiscussion() @@ -209,8 +204,7 @@ class Paste extends AbstractModel if (!array_key_exists('adata', $this->_data) && !array_key_exists('data', $this->_data)) { $this->get(); } - return array_key_exists('adata', $this->_data) && - $this->_data['adata'][self::ADATA_OPEN_DISCUSSION] === 1; + return ($this->_data['adata'][self::ADATA_OPEN_DISCUSSION] ?? 0) === 1; } /** @@ -224,12 +218,9 @@ class Paste extends AbstractModel $expiration = $data['meta']['expire'] ?? 0; unset($data['meta']['expire']); $expire_options = $this->_conf->getSection('expire_options'); - if (array_key_exists($expiration, $expire_options)) { - $expire = $expire_options[$expiration]; - } else { - // using getKey() to ensure a default value is present - $expire = $this->_conf->getKey($this->_conf->getKey('default', 'expire'), 'expire_options'); - } + // using getKey() to ensure a default value is present + $expire = $expire_options[$expiration] ?? + $this->_conf->getKey($this->_conf->getKey('default', 'expire'), 'expire_options'); if ($expire > 0) { $data['meta']['expire_date'] = time() + $expire; } @@ -240,13 +231,13 @@ class Paste extends AbstractModel * * @access protected * @param array $data - * @throws Exception + * @throws TranslatedException */ protected function _validate(array &$data) { // reject invalid or disabled formatters if (!array_key_exists($data['adata'][self::ADATA_FORMATTER], $this->_conf->getSection('formatter_options'))) { - throw new Exception('Invalid data.', 75); + throw new TranslatedException(self::INVALID_DATA_ERROR, 75); } // discussion requested, but disabled in config or burn after reading requested as well, or invalid integer @@ -257,7 +248,7 @@ class Paste extends AbstractModel )) || ($data['adata'][self::ADATA_OPEN_DISCUSSION] !== 0 && $data['adata'][self::ADATA_OPEN_DISCUSSION] !== 1) ) { - throw new Exception('Invalid data.', 74); + throw new TranslatedException(self::INVALID_DATA_ERROR, 74); } // reject invalid burn after reading @@ -265,7 +256,7 @@ class Paste extends AbstractModel $data['adata'][self::ADATA_BURN_AFTER_READING] !== 0 && $data['adata'][self::ADATA_BURN_AFTER_READING] !== 1 ) { - throw new Exception('Invalid data.', 73); + throw new TranslatedException(self::INVALID_DATA_ERROR, 73); } } } diff --git a/lib/Persistence/TrafficLimiter.php b/lib/Persistence/TrafficLimiter.php index 60977f5d..2c937205 100644 --- a/lib/Persistence/TrafficLimiter.php +++ b/lib/Persistence/TrafficLimiter.php @@ -12,11 +12,10 @@ namespace PrivateBin\Persistence; -use Exception; use IPLib\Factory; use IPLib\ParseStringFlag; use PrivateBin\Configuration; -use PrivateBin\I18n; +use PrivateBin\Exception\TranslatedException; /** * TrafficLimiter @@ -74,7 +73,7 @@ class TrafficLimiter extends AbstractPersistence self::setExempted($conf->getKey('exempted', 'traffic')); self::setLimit($conf->getKey('limit', 'traffic')); - if (($option = $conf->getKey('header', 'traffic')) !== '') { + if (!empty($option = $conf->getKey('header', 'traffic'))) { $httpHeader = 'HTTP_' . $option; if (array_key_exists($httpHeader, $_SERVER) && !empty($_SERVER[$httpHeader])) { self::$_ipKey = $httpHeader; @@ -167,7 +166,7 @@ class TrafficLimiter extends AbstractPersistence * * @access public * @static - * @throws Exception + * @throws TranslatedException * @return true */ public static function canPass() @@ -181,7 +180,7 @@ class TrafficLimiter extends AbstractPersistence return true; } } - throw new Exception(I18n::_('Your IP is not authorized to create documents.')); + throw new TranslatedException('Your IP is not authorized to create documents.'); } // disable limits if set to less then 1 @@ -210,9 +209,9 @@ class TrafficLimiter extends AbstractPersistence } return true; } - throw new Exception(I18n::_( + throw new TranslatedException(array( 'Please wait %d seconds between each post.', - self::$_limit + self::$_limit, )); } } diff --git a/lib/Proxy/AbstractProxy.php b/lib/Proxy/AbstractProxy.php index e45f5377..b09c609d 100644 --- a/lib/Proxy/AbstractProxy.php +++ b/lib/Proxy/AbstractProxy.php @@ -11,8 +11,8 @@ namespace PrivateBin\Proxy; -use Exception; use PrivateBin\Configuration; +use PrivateBin\Exception\JsonException; use PrivateBin\Json; /** @@ -55,7 +55,7 @@ abstract class AbstractProxy } if (!str_starts_with($link, $conf->getKey('basepath') . '?') || - parse_url($link, PHP_URL_HOST) != parse_url($conf->getKey('basepath'), PHP_URL_HOST) + parse_url($link, PHP_URL_HOST) !== parse_url($conf->getKey('basepath'), PHP_URL_HOST) ) { $this->_error = 'Trying to shorten a URL that isn\'t pointing at our instance.'; return; @@ -90,7 +90,7 @@ abstract class AbstractProxy try { $jsonData = Json::decode($data); - } catch (Exception $e) { + } catch (JsonException $e) { $this->_error = 'Proxy error: Error parsing proxy response. This can be a configuration issue, like wrong or missing config keys.'; $this->logErrorWithClassName('Error calling proxy: ' . $e->getMessage()); return; diff --git a/lib/Proxy/ShlinkProxy.php b/lib/Proxy/ShlinkProxy.php index ee4507cf..93c3be27 100644 --- a/lib/Proxy/ShlinkProxy.php +++ b/lib/Proxy/ShlinkProxy.php @@ -12,6 +12,7 @@ namespace PrivateBin\Proxy; use PrivateBin\Configuration; +use PrivateBin\Exception\JsonException; use PrivateBin\Json; /** @@ -48,12 +49,17 @@ class ShlinkProxy extends AbstractProxy 'longUrl' => $link, ); - return array( - 'method' => 'POST', - 'header' => "Content-Type: application/json\r\n" . - 'X-Api-Key: ' . $shlink_api_key . "\r\n", - 'content' => Json::encode($body), - ); + try { + return array( + 'method' => 'POST', + 'header' => "Content-Type: application/json\r\n" . + 'X-Api-Key: ' . $shlink_api_key . "\r\n", + 'content' => Json::encode($body), + ); + } catch (JsonException $e) { + error_log('[' . get_class($this) . '] Error encoding body: ' . $e->getMessage()); + return array(); + } } /** @@ -65,11 +71,6 @@ class ShlinkProxy extends AbstractProxy */ protected function _extractShortUrl(array $data): ?string { - if ( - array_key_exists('shortUrl', $data) - ) { - return $data['shortUrl']; - } - return null; + return $data['shortUrl'] ?? null; } } diff --git a/lib/Proxy/YourlsProxy.php b/lib/Proxy/YourlsProxy.php index ae9e11e7..f1762e57 100644 --- a/lib/Proxy/YourlsProxy.php +++ b/lib/Proxy/YourlsProxy.php @@ -65,12 +65,8 @@ class YourlsProxy extends AbstractProxy */ protected function _extractShortUrl(array $data): ?string { - if ( - array_key_exists('statusCode', $data) && - $data['statusCode'] == 200 && - array_key_exists('shorturl', $data) - ) { - return $data['shorturl']; + if (($data['statusCode'] ?? 0) === 200) { + return $data['shorturl'] ?? 0; } return null; } diff --git a/lib/Request.php b/lib/Request.php index 24a083be..2e386e6f 100644 --- a/lib/Request.php +++ b/lib/Request.php @@ -11,7 +11,7 @@ namespace PrivateBin; -use Exception; +use PrivateBin\Exception\JsonException; use PrivateBin\Model\Paste; /** @@ -104,7 +104,7 @@ class Request $this->_isJsonApi = $this->_detectJsonRequest(); // parse parameters, depending on request type - switch (array_key_exists('REQUEST_METHOD', $_SERVER) ? $_SERVER['REQUEST_METHOD'] : 'GET') { + switch ($_SERVER['REQUEST_METHOD'] ?? 'GET') { case 'DELETE': case 'PUT': case 'POST': @@ -113,7 +113,7 @@ class Request try { $data = file_get_contents(self::$_inputStream); $this->_params = Json::decode($data); - } catch (Exception $e) { + } catch (JsonException $e) { // ignore error, $this->_params will remain empty } break; @@ -141,7 +141,7 @@ class Request if (array_key_exists('pasteid', $this->_params) && !empty($this->_params['pasteid'])) { if (array_key_exists('deletetoken', $this->_params) && !empty($this->_params['deletetoken'])) { $this->_operation = 'delete'; - } elseif ($this->_operation != 'create') { + } elseif ($this->_operation !== 'create') { $this->_operation = 'read'; } } elseif (array_key_exists('jsonld', $this->_params) && !empty($this->_params['jsonld'])) { @@ -187,7 +187,7 @@ class Request $data['meta'] = $meta; } foreach ($required_keys as $key) { - $data[$key] = $this->getParam($key, $key == 'v' ? 1 : ''); + $data[$key] = $this->getParam($key, $key === 'v' ? 1 : ''); } // forcing a cast to int or float $data['v'] = $data['v'] + 0; @@ -204,8 +204,7 @@ class Request */ public function getParam($param, $default = '') { - return array_key_exists($param, $this->_params) ? - $this->_params[$param] : $default; + return $this->_params[$param] ?? $default; } /** @@ -263,23 +262,22 @@ class Request */ private function _detectJsonRequest() { - $hasAcceptHeader = array_key_exists('HTTP_ACCEPT', $_SERVER); - $acceptHeader = $hasAcceptHeader ? $_SERVER['HTTP_ACCEPT'] : ''; + $acceptHeader = $_SERVER['HTTP_ACCEPT'] ?? ''; // simple cases if ( - (array_key_exists('HTTP_X_REQUESTED_WITH', $_SERVER) && - $_SERVER['HTTP_X_REQUESTED_WITH'] == 'JSONHttpRequest') || - ($hasAcceptHeader && + ($_SERVER['HTTP_X_REQUESTED_WITH'] ?? '') === 'JSONHttpRequest' || + ( str_contains($acceptHeader, self::MIME_JSON) && !str_contains($acceptHeader, self::MIME_HTML) && - !str_contains($acceptHeader, self::MIME_XHTML)) + !str_contains($acceptHeader, self::MIME_XHTML) + ) ) { return true; } // advanced case: media type negotiation - if ($hasAcceptHeader) { + if (!empty($acceptHeader)) { $mediaTypes = array(); foreach (explode(',', trim($acceptHeader)) as $mediaTypeRange) { if (preg_match( diff --git a/lib/TemplateSwitcher.php b/lib/TemplateSwitcher.php index 22c65b08..fa9fdb18 100644 --- a/lib/TemplateSwitcher.php +++ b/lib/TemplateSwitcher.php @@ -59,16 +59,13 @@ class TemplateSwitcher { if (self::isTemplateAvailable($template)) { self::$_templateFallback = $template; - - if (!in_array($template, self::getAvailableTemplates())) { - // Add custom template to the available templates list - self::$_availableTemplates[] = $template; - } + } else { + error_log('failed to set "' . $template . '" as a fallback, it needs to be added to the list of `availabletemplates` in the configuration file'); } } /** - * get currently loaded template + * get user selected template or fallback * * @access public * @static @@ -76,8 +73,13 @@ class TemplateSwitcher */ public static function getTemplate(): string { - $selectedTemplate = self::getSelectedByUserTemplate(); - return $selectedTemplate ?? self::$_templateFallback; + if (array_key_exists('template', $_COOKIE)) { + $template = basename($_COOKIE['template']); + if (self::isTemplateAvailable($template)) { + return $template; + } + } + return self::$_templateFallback; } /** @@ -101,32 +103,10 @@ class TemplateSwitcher */ public static function isTemplateAvailable(string $template): bool { - $available = in_array($template, self::getAvailableTemplates()); - - if (!$available && !View::isBootstrapTemplate($template)) { - $path = View::getTemplateFilePath($template); - $available = file_exists($path); + if (in_array($template, self::getAvailableTemplates(), true)) { + return true; } - - return $available; - } - - /** - * get the template selected by user - * - * @access private - * @static - * @return string|null - */ - private static function getSelectedByUserTemplate(): ?string - { - $selectedTemplate = null; - $templateCookieValue = $_COOKIE['template'] ?? ''; - - if (self::isTemplateAvailable($templateCookieValue)) { - $selectedTemplate = $templateCookieValue; - } - - return $selectedTemplate; + error_log('template "' . $template . '" is not in the list of `availabletemplates` in the configuration file'); + return false; } } diff --git a/lib/View.php b/lib/View.php index dd15e321..514ac2b1 100644 --- a/lib/View.php +++ b/lib/View.php @@ -49,39 +49,19 @@ class View */ public function draw($template) { - $path = self::getTemplateFilePath($template); - if (!file_exists($path)) { - throw new Exception('Template ' . $template . ' not found!', 80); + $dir = PATH . 'tpl' . DIRECTORY_SEPARATOR; + $file = substr($template, 0, 10) === 'bootstrap-' ? 'bootstrap' : $template; + $path = $dir . $file . '.php'; + if (!is_file($path)) { + throw new Exception('Template ' . $template . ' not found in file ' . $path . '!', 80); + } + if (!in_array($path, glob($dir . '*.php', GLOB_NOSORT | GLOB_ERR), true)) { + throw new Exception('Template ' . $file . '.php not found in ' . $dir . '!', 81); } extract($this->_variables); include $path; } - /** - * Get template file path - * - * @access public - * @param string $template - * @return string - */ - public static function getTemplateFilePath(string $template): string - { - $file = self::isBootstrapTemplate($template) ? 'bootstrap' : $template; - return PATH . 'tpl' . DIRECTORY_SEPARATOR . $file . '.php'; - } - - /** - * Is the template a variation of the bootstrap template - * - * @access public - * @param string $template - * @return bool - */ - public static function isBootstrapTemplate(string $template): bool - { - return substr($template, 0, 10) === 'bootstrap-'; - } - /** * echo script tag incl. SRI hash for given script file * diff --git a/lib/Vizhash16x16.php b/lib/Vizhash16x16.php index 12c2efcc..8ac03be7 100644 --- a/lib/Vizhash16x16.php +++ b/lib/Vizhash16x16.php @@ -103,7 +103,7 @@ class Vizhash16x16 // First, create an image with a specific gradient background. $op = 'v'; - if (($this->getInt() % 2) == 0) { + if (($this->getInt() % 2) === 0) { $op = 'h'; } $image = $this->degrade($image, $op, array($r0, $g0, $b0), array(0, 0, 0)); @@ -179,7 +179,7 @@ class Vizhash16x16 */ private function degrade($img, $direction, $color1, $color2) { - if ($direction == 'h') { + if ($direction === 'h') { $size = imagesx($img); $sizeinv = imagesy($img); } else { @@ -195,7 +195,7 @@ class Vizhash16x16 $r = $color1[0] + ((int) $diffs[0] * $i); $g = $color1[1] + ((int) $diffs[1] * $i); $b = $color1[2] + ((int) $diffs[2] * $i); - if ($direction == 'h') { + if ($direction === 'h') { imageline($img, $i, 0, $i, $sizeinv, imagecolorallocate($img, $r, $g, $b)); } else { imageline($img, 0, $i, $sizeinv, $i, imagecolorallocate($img, $r, $g, $b)); diff --git a/tpl/bootstrap.php b/tpl/bootstrap.php index e842065d..eb759ae4 100644 --- a/tpl/bootstrap.php +++ b/tpl/bootstrap.php @@ -249,7 +249,7 @@ endif; foreach ($EXPIRE as $key => $value) : ?> @@ -327,7 +327,7 @@ if ($isCpct) : foreach ($FORMATTER as $key => $value) : ?> @@ -412,7 +412,7 @@ if (!$isCpct) : foreach ($FORMATTER as $key => $value) : ?> @@ -513,16 +513,19 @@ if ($FILEUPLOAD) : -