summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
l---------[-rwxr-xr-x]git-srht-dispatch68
l---------[-rwxr-xr-x]git-srht-keys34
l---------[-rwxr-xr-x]git-srht-migrate6
l---------[-rwxr-xr-x]git-srht-periodic18
l---------[-rwxr-xr-x]git-srht-shell94
l---------[-rwxr-xr-x]git-srht-update-hook59
-rwxr-xr-x[l---------]gitsrht-dispatch68
-rwxr-xr-x[l---------]gitsrht-keys34
-rwxr-xr-x[l---------]gitsrht-migrate6
-rwxr-xr-x[l---------]gitsrht-periodic18
-rwxr-xr-x[l---------]gitsrht-shell94
-rwxr-xr-x[l---------]gitsrht-update-hook59
12 files changed, 279 insertions, 279 deletions
diff --git a/git-srht-dispatch b/git-srht-dispatch
index 39e8609..a9fb6ba 100755..120000
--- a/git-srht-dispatch
+++ b/git-srht-dispatch
@@ -1,67 +1 @@
-#!/usr/bin/env python3
-# AuthorizedKeysCommand=/usr/bin/git-srht-dispatch "%u" "%h" "%t" "%k"
-# AuthorizedKeysUser=root
-import sys
-import os
-try:
- f = open("/var/log/git-srht-dispatch", "a")
- os.close(sys.stderr.fileno())
- os.dup2(f.fileno(), sys.stderr.fileno())
-except Exception as ex:
- sys.stderr.write("Unable to open log for writing\n")
- sys.stderr.write(str(ex) + "\n")
-from collections import namedtuple
-from datetime import datetime
-from pwd import getpwnam
-from grp import getgrnam
-from srht.config import cfg, cfgkeys
-
-def log(s, *args):
- sys.stderr.write("{} {}\n".format(datetime.now().isoformat(),
- s.format(*args) if isinstance(s, str) else str(s)))
- sys.stderr.flush()
-log("Running git-srht-dispatch")
-
-def auth_keys_error():
- log("This command should be run by sshd's AuthorizedKeysCommand")
- log('AuthorizedKeysCommand={} "%u" "%h" "%t" "%k"\nAuthorizedKeysUser=root',
- os.path.abspath(sys.argv[0]))
- sys.exit(1)
-
-Dispatcher = namedtuple("Dispatcher", ["cmd", "uid", "gid"])
-dispatchers = list()
-
-for cmd in cfgkeys("git.sr.ht::dispatch"):
- user = cfg("git.sr.ht::dispatch", cmd).split(":")
- uid, gid = getpwnam(user[0]).pw_uid, getgrnam(user[-1]).gr_gid
- dispatchers.append(Dispatcher(cmd=cmd, uid=uid, gid=gid))
- log("registered dispatcher for {}:{}: {}", uid, gid, cmd)
-
-if len(sys.argv) != 5:
- auth_keys_error()
-
-user = sys.argv[1]
-uid = getpwnam(user).pw_uid
-homedir = sys.argv[2]
-key_type = sys.argv[3]
-b64key = sys.argv[4]
-authorized_keys_file = "{}/.ssh/authorized_keys".format(homedir)
-
-log("authorizing user={} ({}) home={} b64key={} key_type={}",
- user, uid, homedir, b64key, key_type)
-
-for dispatch in dispatchers:
- if dispatch.uid == uid:
- log("dispatching to {} with uid={}, gid={}",
- dispatch.cmd, dispatch.uid, dispatch.gid)
- os.setgid(dispatch.gid)
- os.setuid(dispatch.uid)
- os.execl(dispatch.cmd, *([dispatch.cmd] + sys.argv[1:]))
-
-log("Falling back to existing authorized keys file")
-if not os.path.exists(authorized_keys_file):
- sys.exit(0)
-with open(authorized_keys_file, "r") as f:
- authorized_keys = f.read()
-print(authorized_keys)
-sys.exit(0)
+gitsrht-dispatch \ No newline at end of file
diff --git a/git-srht-keys b/git-srht-keys
index e797b8f..0db2385 100755..120000
--- a/git-srht-keys
+++ b/git-srht-keys
@@ -1,33 +1 @@
-#!/usr/bin/env python3
-import os
-import sys
-import requests
-from srht.config import cfg
-from srht.database import DbSession
-db = DbSession(cfg("git.sr.ht", "connection-string"))
-from gitsrht.types import User
-db.init()
-
-sys.stderr.write(str(sys.argv) + "\n")
-key_type = sys.argv[3]
-b64key = sys.argv[4]
-
-r = requests.get("{}/api/ssh-key/{}".format(
- cfg("meta.sr.ht", "origin"), b64key))
-if r.status_code != 200:
- sys.stderr.write("meta.sr.ht returned 404 for this key\n")
- sys.exit(0)
-j = r.json()
-username = j["owner"]["name"]
-u = User.query.filter(User.username == username).first()
-if not u:
- sys.stderr.write("Unknown user {}\n", username)
- sys.exit(1)
-default_shell = os.path.join(os.path.dirname(sys.argv[0]), "git-srht-shell")
-shell = cfg("git.sr.ht", "shell", default=default_shell)
-keys = "command=\"{} '{}' '{}'\",".format(shell, u.id, b64key) + \
- "no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty " + \
- "{} {} {}".format(key_type, b64key, username) + "\n"
-print(keys)
-sys.stderr.write(keys)
-sys.exit(0)
+gitsrht-keys \ No newline at end of file
diff --git a/git-srht-migrate b/git-srht-migrate
index 40d34a5..a4fa9cd 100755..120000
--- a/git-srht-migrate
+++ b/git-srht-migrate
@@ -1,5 +1 @@
-#!/usr/bin/env python3
-import gitsrht.alembic
-from srht.config import cfg
-from srht.database import alembic
-alembic("git.sr.ht", gitsrht.alembic)
+gitsrht-migrate \ No newline at end of file
diff --git a/git-srht-periodic b/git-srht-periodic
index 911a01f..d698530 100755..120000
--- a/git-srht-periodic
+++ b/git-srht-periodic
@@ -1,17 +1 @@
-#!/usr/bin/env python3
-from srht.config import cfg
-from srht.database import DbSession
-db = DbSession(cfg("git.sr.ht", "connection-string"))
-from gitsrht.types import Repository, RepoVisibility
-db.init()
-from datetime import datetime, timedelta
-
-def cleanup_autocreated():
- due = datetime.utcnow() - timedelta(minutes=20)
- repos = (Repository.query
- .filter(Repository.visibility == RepoVisibility.autocreated)
- .filter(Repository.created < due)).all()
- (db.session.delete(r) for r in repos)
- db.session.commit()
-
-cleanup_autocreated()
+gitsrht-periodic \ No newline at end of file
diff --git a/git-srht-shell b/git-srht-shell
index 11b1a0d..a8ad789 100755..120000
--- a/git-srht-shell
+++ b/git-srht-shell
@@ -1,93 +1 @@
-#!/usr/bin/env python3
-import sys
-import os
-try:
- f = open("/var/log/git-srht-shell", "a")
- os.close(sys.stderr.fileno())
- os.dup2(f.fileno(), sys.stderr.fileno())
-except Exception as ex:
- sys.stderr.write("Unable to open log for writing\n")
- sys.stderr.write(str(ex) + "\n")
-import requests
-import shlex
-from datetime import datetime
-from srht.config import cfg
-from srht.validation import Validation
-from srht.database import DbSession
-db = DbSession(cfg("git.sr.ht", "connection-string"))
-from gitsrht.types import User, Repository, RepoVisibility, Redirect
-from gitsrht.access import has_access, UserAccess
-from gitsrht.repos import create_repo
-db.init()
-
-def log(s, *args):
- sys.stderr.write("{} {}\n".format(datetime.now().isoformat(),
- s.format(*args) if isinstance(s, str) else str(s)))
-
-origin = cfg("git.sr.ht", "origin")
-repos = cfg("git.sr.ht", "repos")
-
-_cmd = os.environ.get("SSH_ORIGINAL_COMMAND")
-if not _cmd:
- _cmd = ""
-if len(sys.argv) < 2:
- log("Error: expected 2 arguments from SSH")
- sys.exit(1)
-user_id = sys.argv[1]
-ssh_key = sys.argv[2]
-
-user = User.query.filter(User.id == user_id).first()
-if not user:
- log("Unknown user ID {}", user_id)
- sys.exit(1)
-log("User: {}", user.username)
-
-cmd = shlex.split(_cmd)
-valid_commands = ["git-receive-pack", "git-upload-pack", "git-upload-archive"]
-if len(cmd) < 1 or not cmd[0] in valid_commands:
- log("Not permitting unacceptable command")
- print("Hi {}! You've successfully authenticated, ".format(user.username) +
- "but I do not provide an interactive shell. Bye!")
- sys.exit(128)
-os.chdir(repos)
-path = os.path.abspath(cmd[-1])
-if not path.startswith(repos):
- sys.stderr.write("Access denied")
- sys.exit(128)
-cmd[-1] = path
-
-repo = Repository.query.filter(Repository.path == path).first()
-if not repo:
- repo = Redirect.query.filter(Redirect.path == path).first()
- if repo:
- repo = repo.new_repo
- sys.stderr.write("\n\t\033[93mNOTICE\033[0m\n")
- sys.stderr.write("\tThis repository has moved:\n")
- # TODO: orgs
- sys.stderr.write("\t{}/~{}/{}\n".format(
- origin, repo.owner.username, repo.name))
- sys.stderr.write("\tPlease update your remote.\n\n")
- sys.exit(128)
-
- _path, repo_name = os.path.split(path)
- owner = os.path.basename(_path)
- if "~" + user.username != owner:
- sys.exit(128)
-
- valid = Validation({ "name": repo_name })
- repo = create_repo(valid, user)
- if not valid.ok:
- sys.exit(128)
- repo.visibility = RepoVisibility.autocreated
- db.session.commit()
-
-if cmd[0] == "git-receive-pack":
- if not has_access(repo, UserAccess.write, user):
- sys.exit(128)
-else:
- if not has_access(repo, UserAccess.read, user):
- sys.exit(128)
-
-log("Executing {}", " ".join(cmd))
-sys.stderr.close()
-os.execvp(cmd[0], cmd)
+gitsrht-shell \ No newline at end of file
diff --git a/git-srht-update-hook b/git-srht-update-hook
index 014df16..773f2d7 100755..120000
--- a/git-srht-update-hook
+++ b/git-srht-update-hook
@@ -1,58 +1 @@
-#!/usr/bin/env python3
-from srht.config import cfg, cfgi
-from srht.database import DbSession
-db = DbSession(cfg("git.sr.ht", "connection-string"))
-from gitsrht.types import User, Repository, RepoVisibility
-db.init()
-from configparser import ConfigParser
-from datetime import datetime
-from pygit2 import Repository as GitRepository
-import shlex
-import subprocess
-import sys
-import re
-
-op = sys.argv[0]
-builds_sr_ht = cfg("builds.sr.ht", "origin", default=None)
-origin = cfg("git.sr.ht", "origin")
-
-if op == "hooks/post-update":
- refs = sys.argv[1:]
-
- config = ConfigParser()
- with open("config") as f:
- config.read_file(f)
-
- repo_id = config.get("srht", "repo-id")
- if not repo_id:
- sys.exit(0)
- repo_id = int(repo_id)
-
- repo = Repository.query.get(repo_id)
- if not repo:
- sys.exit(0)
-
- if repo.visibility == RepoVisibility.autocreated:
- print("\n\t\033[93mNOTICE\033[0m")
- print("\tWe saved your changes, but this repository does not exist.")
- print("\tClick here to create it:")
- print("\t{}/create?name={}".format(origin, repo.name))
- print("\tYour changes will be discarded in 20 minutes.\n")
-
- repo.updated = datetime.utcnow()
- db.session.commit()
-
- git_repo = GitRepository(repo.path)
- for ref in refs:
- try:
- if re.match(r"^[0-9a-z]{40}$", ref): # commit
- ref = git_repo.get(ref)
- elif ref.startswith("refs/"): # ref
- ref = git_repo.lookup_reference(ref).target
- else:
- continue
- except:
- continue
- if builds_sr_ht:
- from gitsrht.worker import do_post_update
- do_post_update(repo, git_repo, ref)
+gitsrht-update-hook \ No newline at end of file
diff --git a/gitsrht-dispatch b/gitsrht-dispatch
index d17a0bd..39e8609 120000..100755
--- a/gitsrht-dispatch
+++ b/gitsrht-dispatch
@@ -1 +1,67 @@
-git-srht-dispatch \ No newline at end of file
+#!/usr/bin/env python3
+# AuthorizedKeysCommand=/usr/bin/git-srht-dispatch "%u" "%h" "%t" "%k"
+# AuthorizedKeysUser=root
+import sys
+import os
+try:
+ f = open("/var/log/git-srht-dispatch", "a")
+ os.close(sys.stderr.fileno())
+ os.dup2(f.fileno(), sys.stderr.fileno())
+except Exception as ex:
+ sys.stderr.write("Unable to open log for writing\n")
+ sys.stderr.write(str(ex) + "\n")
+from collections import namedtuple
+from datetime import datetime
+from pwd import getpwnam
+from grp import getgrnam
+from srht.config import cfg, cfgkeys
+
+def log(s, *args):
+ sys.stderr.write("{} {}\n".format(datetime.now().isoformat(),
+ s.format(*args) if isinstance(s, str) else str(s)))
+ sys.stderr.flush()
+log("Running git-srht-dispatch")
+
+def auth_keys_error():
+ log("This command should be run by sshd's AuthorizedKeysCommand")
+ log('AuthorizedKeysCommand={} "%u" "%h" "%t" "%k"\nAuthorizedKeysUser=root',
+ os.path.abspath(sys.argv[0]))
+ sys.exit(1)
+
+Dispatcher = namedtuple("Dispatcher", ["cmd", "uid", "gid"])
+dispatchers = list()
+
+for cmd in cfgkeys("git.sr.ht::dispatch"):
+ user = cfg("git.sr.ht::dispatch", cmd).split(":")
+ uid, gid = getpwnam(user[0]).pw_uid, getgrnam(user[-1]).gr_gid
+ dispatchers.append(Dispatcher(cmd=cmd, uid=uid, gid=gid))
+ log("registered dispatcher for {}:{}: {}", uid, gid, cmd)
+
+if len(sys.argv) != 5:
+ auth_keys_error()
+
+user = sys.argv[1]
+uid = getpwnam(user).pw_uid
+homedir = sys.argv[2]
+key_type = sys.argv[3]
+b64key = sys.argv[4]
+authorized_keys_file = "{}/.ssh/authorized_keys".format(homedir)
+
+log("authorizing user={} ({}) home={} b64key={} key_type={}",
+ user, uid, homedir, b64key, key_type)
+
+for dispatch in dispatchers:
+ if dispatch.uid == uid:
+ log("dispatching to {} with uid={}, gid={}",
+ dispatch.cmd, dispatch.uid, dispatch.gid)
+ os.setgid(dispatch.gid)
+ os.setuid(dispatch.uid)
+ os.execl(dispatch.cmd, *([dispatch.cmd] + sys.argv[1:]))
+
+log("Falling back to existing authorized keys file")
+if not os.path.exists(authorized_keys_file):
+ sys.exit(0)
+with open(authorized_keys_file, "r") as f:
+ authorized_keys = f.read()
+print(authorized_keys)
+sys.exit(0)
diff --git a/gitsrht-keys b/gitsrht-keys
index 1e54382..e797b8f 120000..100755
--- a/gitsrht-keys
+++ b/gitsrht-keys
@@ -1 +1,33 @@
-git-srht-keys \ No newline at end of file
+#!/usr/bin/env python3
+import os
+import sys
+import requests
+from srht.config import cfg
+from srht.database import DbSession
+db = DbSession(cfg("git.sr.ht", "connection-string"))
+from gitsrht.types import User
+db.init()
+
+sys.stderr.write(str(sys.argv) + "\n")
+key_type = sys.argv[3]
+b64key = sys.argv[4]
+
+r = requests.get("{}/api/ssh-key/{}".format(
+ cfg("meta.sr.ht", "origin"), b64key))
+if r.status_code != 200:
+ sys.stderr.write("meta.sr.ht returned 404 for this key\n")
+ sys.exit(0)
+j = r.json()
+username = j["owner"]["name"]
+u = User.query.filter(User.username == username).first()
+if not u:
+ sys.stderr.write("Unknown user {}\n", username)
+ sys.exit(1)
+default_shell = os.path.join(os.path.dirname(sys.argv[0]), "git-srht-shell")
+shell = cfg("git.sr.ht", "shell", default=default_shell)
+keys = "command=\"{} '{}' '{}'\",".format(shell, u.id, b64key) + \
+ "no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty " + \
+ "{} {} {}".format(key_type, b64key, username) + "\n"
+print(keys)
+sys.stderr.write(keys)
+sys.exit(0)
diff --git a/gitsrht-migrate b/gitsrht-migrate
index e1d7fcc..40d34a5 120000..100755
--- a/gitsrht-migrate
+++ b/gitsrht-migrate
@@ -1 +1,5 @@
-git-srht-migrate \ No newline at end of file
+#!/usr/bin/env python3
+import gitsrht.alembic
+from srht.config import cfg
+from srht.database import alembic
+alembic("git.sr.ht", gitsrht.alembic)
diff --git a/gitsrht-periodic b/gitsrht-periodic
index 8a10f08..911a01f 120000..100755
--- a/gitsrht-periodic
+++ b/gitsrht-periodic
@@ -1 +1,17 @@
-git-srht-periodic \ No newline at end of file
+#!/usr/bin/env python3
+from srht.config import cfg
+from srht.database import DbSession
+db = DbSession(cfg("git.sr.ht", "connection-string"))
+from gitsrht.types import Repository, RepoVisibility
+db.init()
+from datetime import datetime, timedelta
+
+def cleanup_autocreated():
+ due = datetime.utcnow() - timedelta(minutes=20)
+ repos = (Repository.query
+ .filter(Repository.visibility == RepoVisibility.autocreated)
+ .filter(Repository.created < due)).all()
+ (db.session.delete(r) for r in repos)
+ db.session.commit()
+
+cleanup_autocreated()
diff --git a/gitsrht-shell b/gitsrht-shell
index 33f9dac..11b1a0d 120000..100755
--- a/gitsrht-shell
+++ b/gitsrht-shell
@@ -1 +1,93 @@
-git-srht-shell \ No newline at end of file
+#!/usr/bin/env python3
+import sys
+import os
+try:
+ f = open("/var/log/git-srht-shell", "a")
+ os.close(sys.stderr.fileno())
+ os.dup2(f.fileno(), sys.stderr.fileno())
+except Exception as ex:
+ sys.stderr.write("Unable to open log for writing\n")
+ sys.stderr.write(str(ex) + "\n")
+import requests
+import shlex
+from datetime import datetime
+from srht.config import cfg
+from srht.validation import Validation
+from srht.database import DbSession
+db = DbSession(cfg("git.sr.ht", "connection-string"))
+from gitsrht.types import User, Repository, RepoVisibility, Redirect
+from gitsrht.access import has_access, UserAccess
+from gitsrht.repos import create_repo
+db.init()
+
+def log(s, *args):
+ sys.stderr.write("{} {}\n".format(datetime.now().isoformat(),
+ s.format(*args) if isinstance(s, str) else str(s)))
+
+origin = cfg("git.sr.ht", "origin")
+repos = cfg("git.sr.ht", "repos")
+
+_cmd = os.environ.get("SSH_ORIGINAL_COMMAND")
+if not _cmd:
+ _cmd = ""
+if len(sys.argv) < 2:
+ log("Error: expected 2 arguments from SSH")
+ sys.exit(1)
+user_id = sys.argv[1]
+ssh_key = sys.argv[2]
+
+user = User.query.filter(User.id == user_id).first()
+if not user:
+ log("Unknown user ID {}", user_id)
+ sys.exit(1)
+log("User: {}", user.username)
+
+cmd = shlex.split(_cmd)
+valid_commands = ["git-receive-pack", "git-upload-pack", "git-upload-archive"]
+if len(cmd) < 1 or not cmd[0] in valid_commands:
+ log("Not permitting unacceptable command")
+ print("Hi {}! You've successfully authenticated, ".format(user.username) +
+ "but I do not provide an interactive shell. Bye!")
+ sys.exit(128)
+os.chdir(repos)
+path = os.path.abspath(cmd[-1])
+if not path.startswith(repos):
+ sys.stderr.write("Access denied")
+ sys.exit(128)
+cmd[-1] = path
+
+repo = Repository.query.filter(Repository.path == path).first()
+if not repo:
+ repo = Redirect.query.filter(Redirect.path == path).first()
+ if repo:
+ repo = repo.new_repo
+ sys.stderr.write("\n\t\033[93mNOTICE\033[0m\n")
+ sys.stderr.write("\tThis repository has moved:\n")
+ # TODO: orgs
+ sys.stderr.write("\t{}/~{}/{}\n".format(
+ origin, repo.owner.username, repo.name))
+ sys.stderr.write("\tPlease update your remote.\n\n")
+ sys.exit(128)
+
+ _path, repo_name = os.path.split(path)
+ owner = os.path.basename(_path)
+ if "~" + user.username != owner:
+ sys.exit(128)
+
+ valid = Validation({ "name": repo_name })
+ repo = create_repo(valid, user)
+ if not valid.ok:
+ sys.exit(128)
+ repo.visibility = RepoVisibility.autocreated
+ db.session.commit()
+
+if cmd[0] == "git-receive-pack":
+ if not has_access(repo, UserAccess.write, user):
+ sys.exit(128)
+else:
+ if not has_access(repo, UserAccess.read, user):
+ sys.exit(128)
+
+log("Executing {}", " ".join(cmd))
+sys.stderr.close()
+os.execvp(cmd[0], cmd)
diff --git a/gitsrht-update-hook b/gitsrht-update-hook
index 7789707..014df16 120000..100755
--- a/gitsrht-update-hook
+++ b/gitsrht-update-hook
@@ -1 +1,58 @@
-git-srht-update-hook \ No newline at end of file
+#!/usr/bin/env python3
+from srht.config import cfg, cfgi
+from srht.database import DbSession
+db = DbSession(cfg("git.sr.ht", "connection-string"))
+from gitsrht.types import User, Repository, RepoVisibility
+db.init()
+from configparser import ConfigParser
+from datetime import datetime
+from pygit2 import Repository as GitRepository
+import shlex
+import subprocess
+import sys
+import re
+
+op = sys.argv[0]
+builds_sr_ht = cfg("builds.sr.ht", "origin", default=None)
+origin = cfg("git.sr.ht", "origin")
+
+if op == "hooks/post-update":
+ refs = sys.argv[1:]
+
+ config = ConfigParser()
+ with open("config") as f:
+ config.read_file(f)
+
+ repo_id = config.get("srht", "repo-id")
+ if not repo_id:
+ sys.exit(0)
+ repo_id = int(repo_id)
+
+ repo = Repository.query.get(repo_id)
+ if not repo:
+ sys.exit(0)
+
+ if repo.visibility == RepoVisibility.autocreated:
+ print("\n\t\033[93mNOTICE\033[0m")
+ print("\tWe saved your changes, but this repository does not exist.")
+ print("\tClick here to create it:")
+ print("\t{}/create?name={}".format(origin, repo.name))
+ print("\tYour changes will be discarded in 20 minutes.\n")
+
+ repo.updated = datetime.utcnow()
+ db.session.commit()
+
+ git_repo = GitRepository(repo.path)
+ for ref in refs:
+ try:
+ if re.match(r"^[0-9a-z]{40}$", ref): # commit
+ ref = git_repo.get(ref)
+ elif ref.startswith("refs/"): # ref
+ ref = git_repo.lookup_reference(ref).target
+ else:
+ continue
+ except:
+ continue
+ if builds_sr_ht:
+ from gitsrht.worker import do_post_update
+ do_post_update(repo, git_repo, ref)
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 08:24:32 +0000