From 021f21756339085e9cd73858c62766cbf3ac45fd Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Sat, 4 Feb 2017 23:32:51 -0500 Subject: [PATCH] Initial commit --- .gitignore | 15 + .gitmodules | 3 + LICENSE | 339 ++++++++++++++++ Makefile | 38 ++ README | 55 +++ git/app.py | 66 ++++ git/blueprints/cgit.py | 14 + git/config.py | 23 ++ git/db.py | 28 ++ git/flask.py | 36 ++ git/validation.py | 73 ++++ run.py | 11 + scss/bootstrap | 1 + scss/cgit.scss | 852 +++++++++++++++++++++++++++++++++++++++++ scss/main.scss | 138 +++++++ templates/cgit.html | 4 + templates/git.html | 14 + templates/layout.html | 61 +++ 18 files changed, 1771 insertions(+) create mode 100644 .gitignore create mode 100644 .gitmodules create mode 100644 LICENSE create mode 100644 Makefile create mode 100644 README create mode 100644 git/app.py create mode 100644 git/blueprints/cgit.py create mode 100644 git/config.py create mode 100644 git/db.py create mode 100644 git/flask.py create mode 100644 git/validation.py create mode 100644 run.py create mode 160000 scss/bootstrap create mode 100644 scss/cgit.scss create mode 100644 scss/main.scss create mode 100644 templates/cgit.html create mode 100644 templates/git.html create mode 100644 templates/layout.html diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5e1f80c --- /dev/null +++ b/.gitignore @@ -0,0 +1,15 @@ +*.pyc +bin/ +config.ini +alembic.ini +include/ +local/ +lib/ +static/ +*.swp +*.rdb +storage/ +pip-selfcheck.json +.sass-cache/ +overrides/ +.pgp diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..860ffa4 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "scss/bootstrap"] + path = scss/bootstrap + url = https://github.com/twbs/bootstrap.git diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..d159169 --- /dev/null +++ b/LICENSE @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..81d8d60 --- /dev/null +++ b/Makefile @@ -0,0 +1,38 @@ +# Builds static assets +# Depends on: +# - scss +# - coffeescript +# - inotify-tools +# Run `make` to compile static assets +# Run `make watch` to recompile whenever a change is made + +.PHONY: all static watch clean + +SCRIPTS+=$(patsubst js/%.js,static/%.js,$(wildcard js/*.js)) +_STATIC:=$(patsubst _static/%,static/%,$(wildcard _static/*)) + +static/%: _static/% + @mkdir -p static/ + cp $< $@ + +static/main.css: scss/*.scss + @mkdir -p static/ + scss scss/main.scss $@ + +static/%.js: js/%.js + @mkdir -p static/ + cp $< $@ + +static: $(SCRIPTS) $(_STATIC) static/main.css + +all: static + +clean: + rm -rf static + +watch: + while inotifywait \ + -e close_write js/ \ + -e close_write scss/ \ + -e close_write _static/; \ + do make; done diff --git a/README b/README new file mode 100644 index 0000000..70f316f --- /dev/null +++ b/README @@ -0,0 +1,55 @@ + git.sr.ht + +Handles account management for sr.ht sites. + +DEPENDENCIES + +- Python 3 +- sass +- PostgreSQL + +Python packages: + +- flask +- flask-login +- sqlalchemy +- sqlalchemy-utils + +DEVELOPMENT + +1. Prepare a PostgreSQL connection string and SMTP credentials +2. Copy config.ini.example to config.ini and edit to your liking +3. make (or `make watch` to watch for changes) +4. python3 app.py +5. View http://localhost:5001 in your browser + +INSTALLATION + +Note: by default `make install` installs a systemd unit to /etc/systemd/system. + +1. Prepare a PostgreSQL connection string and SMTP credentials +2. sudo make install +3. Edit /etc/sr.ht/git.ini to your liking +4. Configure an nginx reverse proxy to point to localhost:8000 +5. systemctl enable git.sr.ht +6. systemctl start git.sr.ht + +UPGRADE PROCEDURE + +Before attempting any upgrades, you have to configure your install for database +migrations. Edit /etc/sr.ht/git.alembic.ini to your liking and use the +following procedure to mark the database as current: + +1. sudo systemctl stop git.sr.ht +2. alembic stamp head +3. sudo systemctl start git.sr.ht + +This only needs to be done once. + +To upgrade to a new version of git.sr.ht, perform the following procedure from +the new source tree: + +1. sudo systemctl stop git.sr.ht +2. sudo make install +3. alembic upgrade +4. sudo systemctl start git.sr.ht diff --git a/git/app.py b/git/app.py new file mode 100644 index 0000000..bd34e63 --- /dev/null +++ b/git/app.py @@ -0,0 +1,66 @@ +from flask import Flask, render_template, request, g, Response, redirect, url_for +from jinja2 import FileSystemLoader, ChoiceLoader + +import random +import sys +import os +import locale + +from git.config import cfg, cfgi +from git.db import db, init_db +from git.validation import Validation +from git.flask import MetaFlask + +app = MetaFlask(__name__) +app.secret_key = cfg("server", "secret-key") +app.jinja_env.cache = None +init_db() + +app.jinja_loader = ChoiceLoader([ + FileSystemLoader("overrides"), + FileSystemLoader("templates"), +]) + +try: + locale.setlocale(locale.LC_ALL, 'en_US') +except: + pass + +from git.blueprints.cgit import cgit + +app.register_blueprint(cgit) + +if not app.debug: + @app.errorhandler(500) + def handle_500(e): + # shit + try: + db.rollback() + db.close() + except: + # shit shit + sys.exit(1) + return render_template("internal_error.html"), 500 + +@app.errorhandler(404) +def handle_404(e): + if request.path.startswith("/api"): + return { "errors": [ { "reason": "404 not found" } ] }, 404 + return render_template("not_found.html"), 404 + +@app.context_processor +def inject(): + return { + 'root': cfg("server", "protocol") + "://" + cfg("server", "domain"), + 'domain': cfg("server", "domain"), + 'protocol': cfg("server", "protocol"), + 'len': len, + 'any': any, + 'request': request, + 'locale': locale, + 'url_for': url_for, + 'cfg': cfg, + 'cfgi': cfgi, + 'valid': Validation(request), + 'datef': lambda d: d.strftime('%Y-%m-%d %H:%M:%S UTC') if d is not None else 'Never', + } diff --git a/git/blueprints/cgit.py b/git/blueprints/cgit.py new file mode 100644 index 0000000..6d99de5 --- /dev/null +++ b/git/blueprints/cgit.py @@ -0,0 +1,14 @@ +from flask import Blueprint, request, render_template +import requests +from git.config import cfg + +cgit = Blueprint('cgit', __name__, template_folder="../../templates") + +upstream = cfg("cgit", "remote") + +@cgit.route("//", defaults={ "cgit_path": "" }) +@cgit.route("///", defaults={ "cgit_path": "" }) +@cgit.route("///") +def cgit_passthrough(user, repo, cgit_path): + r = requests.get("{}/{}".format(upstream, request.full_path)) + return render_template("cgit.html", cgit_html=r.text) diff --git a/git/config.py b/git/config.py new file mode 100644 index 0000000..67b3166 --- /dev/null +++ b/git/config.py @@ -0,0 +1,23 @@ +import logging + +try: + from configparser import ConfigParser +except ImportError: + # Python 2 support + from ConfigParser import ConfigParser + +logger = logging.getLogger("sr.ht") +logger.setLevel(logging.DEBUG) + +sh = logging.StreamHandler() +sh.setLevel(logging.DEBUG) +formatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s") +sh.setFormatter(formatter) + +logger.addHandler(sh) + +config = ConfigParser() +config.readfp(open('config.ini')) + +cfg = lambda s, k: config.get(s, k) +cfgi = lambda s, k: int(cfg(s, k)) diff --git a/git/db.py b/git/db.py new file mode 100644 index 0000000..2ea57dc --- /dev/null +++ b/git/db.py @@ -0,0 +1,28 @@ +from sqlalchemy import create_engine, event +from sqlalchemy.orm import scoped_session, sessionmaker +from sqlalchemy.ext.declarative import declarative_base +from datetime import datetime +from git.config import cfg + +engine = create_engine(cfg('git.sr.ht', 'connection-string')) +db = scoped_session(sessionmaker(autocommit=False, autoflush=False, bind=engine)) + +Base = declarative_base() +Base.query = db.query_property() + +def init_db(): + #import git.types + + @event.listens_for(Base, 'before_insert', propagate=True) + def before_insert(mapper, connection, target): + if hasattr(target, 'created'): + target.created = datetime.utcnow() + if hasattr(target, 'updated'): + target.updated = datetime.utcnow() + + @event.listens_for(Base, 'before_update', propagate=True) + def before_update(mapper, connection, target): + if hasattr(target, 'updated'): + target.updated = datetime.utcnow() + + Base.metadata.create_all(bind=engine) diff --git a/git/flask.py b/git/flask.py new file mode 100644 index 0000000..453785c --- /dev/null +++ b/git/flask.py @@ -0,0 +1,36 @@ +from flask import Flask, Response +from enum import Enum +import decimal +import datetime +import json + +DATE_FORMAT = "%Y-%m-%dT%H:%M:%S" + +def date_handler(obj): + if hasattr(obj, 'strftime'): + return obj.strftime(DATE_FORMAT) + if isinstance(obj, decimal.Decimal): + return "{:.2f}".format(obj) + if isinstance(obj, Enum): + return obj.name + return obj + +class MetaFlask(Flask): + def make_response(self, rv): + # Converts responses from dicts to JSON response objects + response = None + + def jsonify_wrap(obj): + jsonification = json.dumps(obj, default=date_handler) + return Response(jsonification, mimetype='application/json') + + if isinstance(rv, tuple) and \ + (isinstance(rv[0], dict) or isinstance(rv[0], list)): + response = jsonify_wrap(rv[0]), rv[1] + elif isinstance(rv, dict): + response = jsonify_wrap(rv) + elif isinstance(rv, list): + response = jsonify_wrap(rv) + else: + response = rv + return super(MetaFlask, self).make_response(response) diff --git a/git/validation.py b/git/validation.py new file mode 100644 index 0000000..e995d7c --- /dev/null +++ b/git/validation.py @@ -0,0 +1,73 @@ +from markupsafe import Markup +from urllib import parse +import json + +class ValidationError: + def __init__(self, field, message): + self.field = field + self.message = message + + def json(self): + j = dict() + if self.field: + j['field'] = self.field + if self.message: + j['reason'] = self.message + return j + +class Validation: + def __init__(self, request): + contentType = request.headers.get("Content-Type") + if contentType and contentType == "application/json": + self.source = json.loads(request.data.decode('utf-8')) + else: + self.source = request.form + self.request = request + self.errors = [] + + @property + def ok(self): + return len(self.errors) == 0 + + def cls(self, name): + return 'has-danger' if any([e for e in self.errors if e.field == name]) else "" + + def summary(self, name=None): + errors = [e.message for e in self.errors if e.field == name or name == '@all'] + if len(errors) == 0: + return '' + if name is None: + return Markup('
{}
' + .format('
'.join(errors))) + else: + return Markup('' + .format('
'.join(errors))) + + @property + def response(self): + return { "errors": [ e.json() for e in self.errors ] }, 400 + + def error(self, message, field=None): + self.errors.append(ValidationError(field, message)) + + def optional(self, name, default=None): + return self.source.get(name) or default + + def require(self, name, friendly_name=None): + value = self.source.get(name) + if not friendly_name: + friendly_name = name + if not value: + self.error('{} is required'.format(friendly_name), field=name) + return value + + def expect(self, condition, message, field=None): + if not condition: + self.error(message, field) + +def valid_url(url): + try: + u = parse.urlparse(url) + return bool(u.scheme and u.netloc and u.scheme in ['http', 'https']) + except: + return False diff --git a/run.py b/run.py new file mode 100644 index 0000000..d68c53e --- /dev/null +++ b/run.py @@ -0,0 +1,11 @@ +from git.app import app +from git.config import cfg, cfgi + +import os + +app.static_folder = os.path.join(os.getcwd(), "static") + +if __name__ == '__main__': + app.run(host=cfg("debug", "debug-host"), + port=cfgi("debug", "debug-port"), + debug=True) diff --git a/scss/bootstrap b/scss/bootstrap new file mode 160000 index 0000000..295c938 --- /dev/null +++ b/scss/bootstrap @@ -0,0 +1 @@ +Subproject commit 295c93846c154fb461f85b30e663102f7e171104 diff --git a/scss/cgit.scss b/scss/cgit.scss new file mode 100644 index 0000000..1dc2c11 --- /dev/null +++ b/scss/cgit.scss @@ -0,0 +1,852 @@ +div#cgit { + padding: 0em; + margin: 0em; + font-family: sans-serif; + font-size: 10pt; + color: #333; + background: white; + padding: 4px; +} + +div#cgit a { + color: blue; + text-decoration: none; +} + +div#cgit a:hover { + text-decoration: underline; +} + +div#cgit table { + border-collapse: collapse; +} + +div#cgit table#header { + width: 100%; + margin-bottom: 1em; +} + +div#cgit table#header td.logo { + width: 96px; + vertical-align: top; +} + +div#cgit table#header td.main { + font-size: 250%; + padding-left: 10px; + white-space: nowrap; +} + +div#cgit table#header td.main a { + color: #000; +} + +div#cgit table#header td.form { + text-align: right; + vertical-align: bottom; + padding-right: 1em; + padding-bottom: 2px; + white-space: nowrap; +} + +div#cgit table#header td.form form, +div#cgit table#header td.form input, +div#cgit table#header td.form select { + font-size: 90%; +} + +div#cgit table#header td.sub { + color: #777; + border-top: solid 1px #ccc; + padding-left: 10px; +} + +div#cgit table.tabs { + border-bottom: solid 3px #ccc; + border-collapse: collapse; + margin-top: 2em; + margin-bottom: 0px; + width: 100%; +} + +div#cgit table.tabs td { + padding: 0px 1em; + vertical-align: bottom; +} + +div#cgit table.tabs td a { + padding: 2px 0.75em; + color: #777; + font-size: 110%; +} + +div#cgit table.tabs td a.active { + color: #000; + background-color: #ccc; +} + +div#cgit table.tabs a[href^="http://"]:after, div#cgit table.tabs a[href^="https://"]:after { + content: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAQAAAAnOwc2AAAAAmJLR0QA/4ePzL8AAAAJcEhZcwAACxMAAAsTAQCanBgAAAAHdElNRQfgAhcJDQY+gm2TAAAAHWlUWHRDb21tZW50AAAAAABDcmVhdGVkIHdpdGggR0lNUGQuZQcAAABbSURBVAhbY2BABs4MU4CwhYHBh2Erww4wrGFQZHjI8B8IgUIscJWyDHcggltQhI4zGDCcRwhChPggHIggP1QoAVmQkSETrGoHsiAEsACtBYN0oDAMbgU6EBcAAL2eHUt4XUU4AAAAAElFTkSuQmCC); + opacity: 0.5; + margin: 0 0 0 5px; +} + +div#cgit table.tabs td.form { + text-align: right; +} + +div#cgit table.tabs td.form form { + padding-bottom: 2px; + font-size: 90%; + white-space: nowrap; +} + +div#cgit table.tabs td.form input, +div#cgit table.tabs td.form select { + font-size: 90%; +} + +div#cgit div.path { + margin: 0px; + padding: 5px 2em 2px 2em; + color: #000; + background-color: #eee; +} + +div#cgit div.content { + margin: 0px; + padding: 2em; + border-bottom: solid 3px #ccc; +} + + +div#cgit table.list { + width: 100%; + border: none; + border-collapse: collapse; +} + +div#cgit table.list tr { + background: white; +} + +div#cgit table.list tr.logheader { + background: #eee; +} + +div#cgit table.list tr:nth-child(even) { + background: #f7f7f7; +} + +div#cgit table.list tr:nth-child(odd) { + background: white; +} + +div#cgit table.list tr:hover { + background: #eee; +} + +div#cgit table.list tr.nohover { + background: white; +} + +div#cgit table.list tr.nohover:hover { + background: white; +} + +div#cgit table.list tr.nohover-highlight:hover:nth-child(even) { + background: #f7f7f7; +} + +div#cgit table.list tr.nohover-highlight:hover:nth-child(odd) { + background: white; +} + +div#cgit table.list th { + font-weight: bold; + /* color: #888; + border-top: dashed 1px #888; + border-bottom: dashed 1px #888; + */ + padding: 0.1em 0.5em 0.05em 0.5em; + vertical-align: baseline; +} + +div#cgit table.list td { + border: none; + padding: 0.1em 0.5em 0.1em 0.5em; +} + +div#cgit table.list td.commitgraph { + font-family: monospace; + white-space: pre; +} + +div#cgit table.list td.commitgraph .column1 { + color: #a00; +} + +div#cgit table.list td.commitgraph .column2 { + color: #0a0; +} + +div#cgit table.list td.commitgraph .column3 { + color: #aa0; +} + +div#cgit table.list td.commitgraph .column4 { + color: #00a; +} + +div#cgit table.list td.commitgraph .column5 { + color: #a0a; +} + +div#cgit table.list td.commitgraph .column6 { + color: #0aa; +} + +div#cgit table.list td.logsubject { + font-family: monospace; + font-weight: bold; +} + +div#cgit table.list td.logmsg { + font-family: monospace; + white-space: pre; + padding: 0 0.5em; +} + +div#cgit table.list td a { + color: black; +} + +div#cgit table.list td a.ls-dir { + font-weight: bold; + color: #00f; +} + +div#cgit table.list td a:hover { + color: #00f; +} + +div#cgit img { + border: none; +} + +div#cgit input#switch-btn { + margin: 2px 0px 0px 0px; +} + +div#cgit td#sidebar input.txt { + width: 100%; + margin: 2px 0px 0px 0px; +} + +div#cgit table#grid { + margin: 0px; +} + +div#cgit td#content { + vertical-align: top; + padding: 1em 2em 1em 1em; + border: none; +} + +div#cgit div#summary { + vertical-align: top; + margin-bottom: 1em; +} + +div#cgit table#downloads { + float: right; + border-collapse: collapse; + border: solid 1px #777; + margin-left: 0.5em; + margin-bottom: 0.5em; +} + +div#cgit table#downloads th { + background-color: #ccc; +} + +div#cgit div#blob { + border: solid 1px black; +} + +div#cgit div.error { + color: red; + font-weight: bold; + margin: 1em 2em; +} + +div#cgit a.ls-blob, div#cgit a.ls-dir, div#cgit .ls-mod { + font-family: monospace; +} + +div#cgit td.ls-size { + text-align: right; + font-family: monospace; + width: 10em; +} + +div#cgit td.ls-mode { + font-family: monospace; + width: 10em; +} + +div#cgit table.blob { + margin-top: 0.5em; + border-top: solid 1px black; +} + +div#cgit table.blob td.lines { + margin: 0; padding: 0 0 0 0.5em; + vertical-align: top; + color: black; +} + +div#cgit table.blob td.linenumbers { + margin: 0; padding: 0 0.5em 0 0.5em; + vertical-align: top; + text-align: right; + border-right: 1px solid gray; +} + +div#cgit table.blob pre { + padding: 0; margin: 0; +} + +div#cgit table.blob td.linenumbers a, +div#cgit table.ssdiff td.lineno a { + color: gray; + text-align: right; + text-decoration: none; +} + +div#cgit table.blob td.linenumbers a:hover, +div#cgit table.ssdiff td.lineno a:hover { + color: black; +} + +div#cgit table.bin-blob { + margin-top: 0.5em; + border: solid 1px black; +} + +div#cgit table.bin-blob th { + font-family: monospace; + white-space: pre; + border: solid 1px #777; + padding: 0.5em 1em; +} + +div#cgit table.bin-blob td { + font-family: monospace; + white-space: pre; + border-left: solid 1px #777; + padding: 0em 1em; +} + +div#cgit table.nowrap td { + white-space: nowrap; +} + +div#cgit table.commit-info { + border-collapse: collapse; + margin-top: 1.5em; +} + +div#cgit div.cgit-panel { + float: right; + margin-top: 1.5em; +} + +div#cgit div.cgit-panel table { + border-collapse: collapse; + border: solid 1px #aaa; + background-color: #eee; +} + +div#cgit div.cgit-panel th { + text-align: center; +} + +div#cgit div.cgit-panel td { + padding: 0.25em 0.5em; +} + +div#cgit div.cgit-panel td.label { + padding-right: 0.5em; +} + +div#cgit div.cgit-panel td.ctrl { + padding-left: 0.5em; +} + +div#cgit table.commit-info th { + text-align: left; + font-weight: normal; + padding: 0.1em 1em 0.1em 0.1em; + vertical-align: top; +} + +div#cgit table.commit-info td { + font-weight: normal; + padding: 0.1em 1em 0.1em 0.1em; +} + +div#cgit div.commit-subject { + font-weight: bold; + font-size: 125%; + margin: 1.5em 0em 0.5em 0em; + padding: 0em; +} + +div#cgit div.commit-msg { + white-space: pre; + font-family: monospace; +} + +div#cgit div.notes-header { + font-weight: bold; + padding-top: 1.5em; +} + +div#cgit div.notes { + white-space: pre; + font-family: monospace; + border: solid 1px #ee9; + background-color: #ffd; + padding: 0.3em 2em 0.3em 1em; + float: left; +} + +div#cgit div.notes-footer { + clear: left; +} + +div#cgit div.diffstat-header { + font-weight: bold; + padding-top: 1.5em; +} + +div#cgit table.diffstat { + border-collapse: collapse; + border: solid 1px #aaa; + background-color: #eee; +} + +div#cgit table.diffstat th { + font-weight: normal; + text-align: left; + text-decoration: underline; + padding: 0.1em 1em 0.1em 0.1em; + font-size: 100%; +} + +div#cgit table.diffstat td { + padding: 0.2em 0.2em 0.1em 0.1em; + font-size: 100%; + border: none; +} + +div#cgit table.diffstat td.mode { + white-space: nowrap; +} + +div#cgit table.diffstat td span.modechange { + padding-left: 1em; + color: red; +} + +div#cgit table.diffstat td.add a { + color: green; +} + +div#cgit table.diffstat td.del a { + color: red; +} + +div#cgit table.diffstat td.upd a { + color: blue; +} + +div#cgit table.diffstat td.graph { + width: 500px; + vertical-align: middle; +} + +div#cgit table.diffstat td.graph table { + border: none; +} + +div#cgit table.diffstat td.graph td { + padding: 0px; + border: 0px; + height: 7pt; +} + +div#cgit table.diffstat td.graph td.add { + background-color: #5c5; +} + +div#cgit table.diffstat td.graph td.rem { + background-color: #c55; +} + +div#cgit div.diffstat-summary { + color: #888; + padding-top: 0.5em; +} + +div#cgit table.diff { + width: 100%; +} + +div#cgit table.diff td { + font-family: monospace; + white-space: pre; +} + +div#cgit table.diff td div.head { + font-weight: bold; + margin-top: 1em; + color: black; +} + +div#cgit table.diff td div.hunk { + color: #009; +} + +div#cgit table.diff td div.add { + color: green; +} + +div#cgit table.diff td div.del { + color: red; +} + +div#cgit .sha1 { + font-family: monospace; + font-size: 90%; +} + +div#cgit .left { + text-align: left; +} + +div#cgit .right { + text-align: right; +} + +div#cgit table.list td.reposection { + font-style: italic; + color: #888; +} + +div#cgit a.button { + font-size: 80%; + padding: 0em 0.5em; +} + +div#cgit a.primary { + font-size: 100%; +} + +div#cgit a.secondary { + font-size: 90%; +} + +div#cgit td.toplevel-repo { + +} + +div#cgit table.list td.sublevel-repo { + padding-left: 1.5em; +} + +div#cgit ul.pager { + list-style-type: none; + text-align: center; + margin: 1em 0em 0em 0em; + padding: 0; +} + +div#cgit ul.pager li { + display: inline-block; + margin: 0.25em 0.5em; +} + +div#cgit ul.pager a { + color: #777; +} + +div#cgit ul.pager .current { + font-weight: bold; +} + +div#cgit span.age-mins { + font-weight: bold; + color: #080; +} + +div#cgit span.age-hours { + color: #080; +} + +div#cgit span.age-days { + color: #040; +} + +div#cgit span.age-weeks { + color: #444; +} + +div#cgit span.age-months { + color: #888; +} + +div#cgit span.age-years { + color: #bbb; +} + +div#cgit span.insertions { + color: #080; +} + +div#cgit span.deletions { + color: #800; +} + +div#cgit div.footer { + margin-top: 0.5em; + text-align: center; + font-size: 80%; + color: #ccc; +} + +div#cgit div.footer a { + color: #ccc; + text-decoration: none; +} + +div#cgit div.footer a:hover { + text-decoration: underline; +} + +div#cgit a.branch-deco { + color: #000; + margin: 0px 0.5em; + padding: 0px 0.25em; + background-color: #88ff88; + border: solid 1px #007700; +} + +div#cgit a.tag-deco { + color: #000; + margin: 0px 0.5em; + padding: 0px 0.25em; + background-color: #ffff88; + border: solid 1px #777700; +} + +div#cgit a.remote-deco { + color: #000; + margin: 0px 0.5em; + padding: 0px 0.25em; + background-color: #ccccff; + border: solid 1px #000077; +} + +div#cgit a.deco { + color: #000; + margin: 0px 0.5em; + padding: 0px 0.25em; + background-color: #ff8888; + border: solid 1px #770000; +} + +div#cgit div.commit-subject a.branch-deco, +div#cgit div.commit-subject a.tag-deco, +div#cgit div.commit-subject a.remote-deco, +div#cgit div.commit-subject a.deco { + margin-left: 1em; + font-size: 75%; +} + +div#cgit table.stats { + border: solid 1px black; + border-collapse: collapse; +} + +div#cgit table.stats th { + text-align: left; + padding: 1px 0.5em; + background-color: #eee; + border: solid 1px black; +} + +div#cgit table.stats td { + text-align: right; + padding: 1px 0.5em; + border: solid 1px black; +} + +div#cgit table.stats td.total { + font-weight: bold; + text-align: left; +} + +div#cgit table.stats td.sum { + color: #c00; + font-weight: bold; +/* background-color: #eee; */ +} + +div#cgit table.stats td.left { + text-align: left; +} + +div#cgit table.vgraph { + border-collapse: separate; + border: solid 1px black; + height: 200px; +} + +div#cgit table.vgraph th { + background-color: #eee; + font-weight: bold; + border: solid 1px white; + padding: 1px 0.5em; +} + +div#cgit table.vgraph td { + vertical-align: bottom; + padding: 0px 10px; +} + +div#cgit table.vgraph div.bar { + background-color: #eee; +} + +div#cgit table.hgraph { + border: solid 1px black; + width: 800px; +} + +div#cgit table.hgraph th { + background-color: #eee; + font-weight: bold; + border: solid 1px black; + padding: 1px 0.5em; +} + +div#cgit table.hgraph td { + vertical-align: middle; + padding: 2px 2px; +} + +div#cgit table.hgraph div.bar { + background-color: #eee; + height: 1em; +} + +div#cgit table.ssdiff { + width: 100%; +} + +div#cgit table.ssdiff td { + font-size: 75%; + font-family: monospace; + white-space: pre; + padding: 1px 4px 1px 4px; + border-left: solid 1px #aaa; + border-right: solid 1px #aaa; +} + +div#cgit table.ssdiff td.add { + color: black; + background: #cfc; + min-width: 50%; +} + +div#cgit table.ssdiff td.add_dark { + color: black; + background: #aca; + min-width: 50%; +} + +div#cgit table.ssdiff span.add { + background: #cfc; + font-weight: bold; +} + +div#cgit table.ssdiff td.del { + color: black; + background: #fcc; + min-width: 50%; +} + +div#cgit table.ssdiff td.del_dark { + color: black; + background: #caa; + min-width: 50%; +} + +div#cgit table.ssdiff span.del { + background: #fcc; + font-weight: bold; +} + +div#cgit table.ssdiff td.changed { + color: black; + background: #ffc; + min-width: 50%; +} + +div#cgit table.ssdiff td.changed_dark { + color: black; + background: #cca; + min-width: 50%; +} + +div#cgit table.ssdiff td.lineno { + color: black; + background: #eee; + text-align: right; + width: 3em; + min-width: 3em; +} + +div#cgit table.ssdiff td.hunk { + color: black; + background: #ccf; + border-top: solid 1px #aaa; + border-bottom: solid 1px #aaa; +} + +div#cgit table.ssdiff td.head { + border-top: solid 1px #aaa; + border-bottom: solid 1px #aaa; +} + +div#cgit table.ssdiff td.head div.head { + font-weight: bold; + color: black; +} + +div#cgit table.ssdiff td.foot { + border-top: solid 1px #aaa; + border-left: none; + border-right: none; + border-bottom: none; +} + +div#cgit table.ssdiff td.space { + border: none; +} + +div#cgit table.ssdiff td.space div { + min-height: 3em; +} diff --git a/scss/main.scss b/scss/main.scss new file mode 100644 index 0000000..171e536 --- /dev/null +++ b/scss/main.scss @@ -0,0 +1,138 @@ +@import "bootstrap/scss/bootstrap"; + +$base-font-size: 0.9rem; + +body { + font-family: sans-serif; + font-size: $base-font-size; +} + +p { + margin-bottom: 0.5rem; +} + +label { + margin-bottom: 0.25rem; +} + +input[type="text"], +input[type="email"], +input[type="password"], +textarea.form-control { + border-radius: 0; + border-color: #888; + color: $gray-dark; + padding: 0.25rem 0.375rem; + + &:active, &:focus { + color: $gray-dark; + } +} + +h1, h2 { + margin-top: 0; +} + +h3 { + font-size: 1.3rem; + border-bottom: 1px solid $gray-lighter; + padding-bottom: 0.25rem; + + small { + @extend .text-muted; + font-size: 1rem; + margin-left: 1rem; + } +} + +h4 { + margin-top: 1rem; + font-size: 1.1rem; +} + +section { + padding-bottom: 0.5rem; +} + +.container { + margin: 0; +} + +.btn { + border-radius: 0; + padding: 0.1rem 0.75rem; + + &.btn-default { + transition: background 0.1s linear; + background: $gray-lighter; + border: $gray-dark 1px solid; + font-size: 0.9rem; + color: black; + + &:hover { + background: $gray-lightest; + } + } + + &.btn-danger { + border: $btn-danger-border 1px solid; + font-size: 0.9rem; + } + + &.btn-link { + padding: 0; + font-size: $base-font-size; + margin-top: -0.1rem; + } +} + +.navbar { + .navbar-brand { + padding: 0 1rem 0 0; + line-height: 1.8; + } + + li { + font-size: $base-font-size; + line-height: 1.8; + } + + .login { + padding: 0.425rem 0; + font-size: $base-font-size; + line-height: 1.5; + } +} + +.nav-tabs { + padding-left: 1rem; + margin-bottom: 0.5rem; + border-bottom: 3px #ddd solid; + + .nav-link { + padding: 0 1rem; + border-radius: 0; + color: black; + cursor: pointer; + + &.active, &.active:hover { + color: black; + background: #ddd; + } + } +} + +.alert { + padding: 0.5rem; + border-radius: 0; + + .form-group & { + margin-top: 1rem; + } +} + +.text-centered { + text-align: center; +} + +@import "cgit"; diff --git a/templates/cgit.html b/templates/cgit.html new file mode 100644 index 0000000..0977688 --- /dev/null +++ b/templates/cgit.html @@ -0,0 +1,4 @@ +{% extends "git.html" %} +{% block content %} +{{ cgit_html | safe }} +{% endblock %} diff --git a/templates/git.html b/templates/git.html new file mode 100644 index 0000000..0e79197 --- /dev/null +++ b/templates/git.html @@ -0,0 +1,14 @@ +{% extends "layout.html" %} +{% block body %} +
+
+
+

git

+
+

Git repositories for sr.ht users

+
+
+
+
+{% block content %}{% endblock %} +{% endblock %} diff --git a/templates/layout.html b/templates/layout.html new file mode 100644 index 0000000..c4747a0 --- /dev/null +++ b/templates/layout.html @@ -0,0 +1,61 @@ + + + + {% block title %} + sr.ht git + {% endblock %} + + + + + {% block nav %} + + {% endblock %} + {% block body %} +
+ {% block content %}{% endblock %} +
+ {% endblock %} + {% block modal %}{% endblock %} + {% block scripts %}{% endblock %} + + -- 2.38.4