[aur-dev] [PATCH 1/2] Use readfile() instead of include for static files
Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de> --- web/html/index.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/html/index.php b/web/html/index.php index e05b555..91d0222 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -143,12 +143,12 @@ if (!empty($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) { case "/css/aur.css": case "/css/archnavbar/archnavbar.css": header("Content-Type: text/css"); - include "./$path"; + readfile("./$path"); break; case "/css/archnavbar/archlogo.gif": case "/images/new.png": header("Content-Type: image/png"); - include "./$path"; + readfile("./$path"); break; case "/css/archnavbar/archlogo.png": case "/images/AUR-logo-80.png": @@ -158,11 +158,11 @@ if (!empty($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) { case "/images/titlelogo.png": case "/images/x.png": header("Content-Type: image/png"); - include "./$path"; + readfile("./$path"); break; case "/js/bootstrap-typeahead.min.js": header("Content-Type: application/javascript"); - include "./$path"; + readfile("./$path"); break; default: header("HTTP/1.0 404 Not Found"); -- 2.1.2
This can be used to regularly generate lists of packages and package bases that are made available under /packages.gz and /pkgbase.gz, respectively. Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de> --- scripts/config.proto | 5 +++++ scripts/mkpkglists.py | 38 ++++++++++++++++++++++++++++++++++++++ web/html/index.php | 6 ++++++ 3 files changed, 49 insertions(+) create mode 100644 scripts/config.proto create mode 100755 scripts/mkpkglists.py diff --git a/scripts/config.proto b/scripts/config.proto new file mode 100644 index 0000000..4cac94f --- /dev/null +++ b/scripts/config.proto @@ -0,0 +1,5 @@ +[database] +host = localhost +name = AUR +user = aur +password = aur diff --git a/scripts/mkpkglists.py b/scripts/mkpkglists.py new file mode 100755 index 0000000..c208fd1 --- /dev/null +++ b/scripts/mkpkglists.py @@ -0,0 +1,38 @@ +#!/usr/bin/python3 + +import configparser +import datetime +import gzip +import mysql.connector +import os + +docroot = os.path.dirname(os.path.realpath(__file__)) + "/../web/html/" + +config = configparser.RawConfigParser() +config.read(os.path.dirname(os.path.realpath(__file__)) + "/config") + +aur_db_host = config.get('database', 'host') +aur_db_name = config.get('database', 'name') +aur_db_user = config.get('database', 'user') +aur_db_pass = config.get('database', 'password') + +db = mysql.connector.connect(host=aur_db_host, user=aur_db_user, + passwd=aur_db_pass, db=aur_db_name, + buffered=True) +cur = db.cursor() + +datestr = datetime.datetime.utcnow().strftime("%a, %d %b %Y %H:%M:%S GMT") +pkglist_header = "# AUR package list, generated on " + datestr +pkgbaselist_header = "# AUR package base list, generated on " + datestr + +with gzip.open(docroot + "packages.gz", "w") as f: + f.write(bytes(pkglist_header + "\n", "UTF-8")) + cur.execute("SELECT Name FROM Packages") + f.writelines([bytes(x[0] + "\n", "UTF-8") for x in cur.fetchall()]) + +with gzip.open(docroot + "pkgbase.gz", "w") as f: + f.write(bytes(pkgbaselist_header + "\n", "UTF-8")) + cur.execute("SELECT Name FROM PackageBases") + f.writelines([bytes(x[0] + "\n", "UTF-8") for x in cur.fetchall()]) + +db.close() diff --git a/web/html/index.php b/web/html/index.php index 91d0222..95989f5 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -164,6 +164,12 @@ if (!empty($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) { header("Content-Type: application/javascript"); readfile("./$path"); break; + case "/packages.gz": + case "/pkgbase.gz": + header("Content-Type: text/plain"); + header("Content-Encoding: gzip"); + readfile("./$path"); + break; default: header("HTTP/1.0 404 Not Found"); include "./404.php"; -- 2.1.2
participants (1)
-
Lukas Fleischer