gitea: fix uffd login

(note that this actually has to patch uffd)
This commit is contained in:
stuebinm 2022-07-20 18:30:47 +02:00
parent f9f1eee6fd
commit b5a68e09fd
No known key found for this signature in database
GPG key ID: 695C841098BECF1D
3 changed files with 40 additions and 3 deletions

View file

@ -5,12 +5,11 @@ python3Packages.buildPythonPackage rec {
version = "2.0.1"; version = "2.0.1";
src = fetchzip { src = fetchzip {
url = url = "https://git.cccv.de/uffd/uffd/-/archive/v${version}/uffd-v${version}.tar.gz";
"https://git.cccv.de/uffd/uffd/-/archive/v${version}/uffd-v${version}.tar.gz";
hash = "sha256-KP4J1bw5u7MklaPu2SBFRNyGgkKOBOpft5MMH+em5M4="; hash = "sha256-KP4J1bw5u7MklaPu2SBFRNyGgkKOBOpft5MMH+em5M4=";
}; };
patches = [ ./fix-setuppy.patch ./fix-userinfo.patch ]; patches = [ ./gitea-magic.patch ./fix-setuppy.patch ./fix-userinfo.patch ];
propagatedBuildInputs = with python3Packages; [ propagatedBuildInputs = with python3Packages; [
flask flask

View file

@ -0,0 +1,32 @@
From e3c0995160a653ef6cd8784b255036585b273b82 Mon Sep 17 00:00:00 2001
From: stuebinm <stuebinm@disroot.org>
Date: Wed, 20 Jul 2022 18:02:15 +0200
Subject: [PATCH] magic gitea patch
---
uffd/oauth2/views.py | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/uffd/oauth2/views.py b/uffd/oauth2/views.py
index d13fd42..94352be 100644
--- a/uffd/oauth2/views.py
+++ b/uffd/oauth2/views.py
@@ -230,6 +230,15 @@ def oauth_required(*scopes):
@oauth_required('profile')
def userinfo():
user = request.oauth.user
+ client = request.oauth.client_id
+ if client == "gitea":
+ return jsonify(
+ id=user.unix_uid,
+ full_name=user.displayname,
+ login=user.loginname,
+ email=user.mail,
+ groups=[group.name for group in user.groups]
+ )
return jsonify(
id=user.unix_uid,
name=user.displayname,
--
2.36.0

View file

@ -22,6 +22,8 @@
imports = [ ((import sources.nix-hexchen) { }).profiles.nopersist ]; imports = [ ((import sources.nix-hexchen) { }).profiles.nopersist ];
environment.systemPackages = [ pkgs.gitea ];
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
networking.firewall.enable = false; networking.firewall.enable = false;
networking.defaultGateway = { networking.defaultGateway = {
@ -63,6 +65,10 @@
PREFERRED_LICENSES = "Unlicense"; PREFERRED_LICENSES = "Unlicense";
DEFAULT_BRANCH = "main"; DEFAULT_BRANCH = "main";
}; };
oauth2_client = {
ACCOUNT_LINKING = "auto";
ENABLE_AUTO_REGISTRATION = true;
};
"repository.pull-requests" = { "repository.pull-requests" = {
DEFAULT_MERGE_STYLE = "merge"; DEFAULT_MERGE_STYLE = "merge";
DEFAULT_MERGE_MESSAGE_ALL_AUTHORS = true; DEFAULT_MERGE_MESSAGE_ALL_AUTHORS = true;