From 22149d17ff17e9870b3245f07abe05e5d026fdd3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Isma=C3=ABl=20Bouya?= Date: Mon, 4 Mar 2019 23:39:18 +0100 Subject: [PATCH] Add task server Related issue: https://git.immae.eu/mantisbt/view.php?id=67 --- nixops/eldiron.nix | 2 + nixops/modules/databases/immae.schema | 16 ++- nixops/modules/task/default.nix | 131 +++++++++++++++++++++++++ nixops/modules/task/www/index.php | 135 ++++++++++++++++++++++++++ 4 files changed, 282 insertions(+), 2 deletions(-) create mode 100644 nixops/modules/task/default.nix create mode 100644 nixops/modules/task/www/index.php diff --git a/nixops/eldiron.nix b/nixops/eldiron.nix index 5f0b5d5..21d3390 100644 --- a/nixops/eldiron.nix +++ b/nixops/eldiron.nix @@ -31,6 +31,7 @@ ./modules/mail ./modules/ftp ./modules/pub + ./modules/task ]; services.myGitolite.enable = true; services.myDatabases.enable = true; @@ -39,6 +40,7 @@ services.myWebsites.tools.enable = true; services.pure-ftpd.enable = true; services.pub.enable = true; + services.myTasks.enable = true; services.journald.extraConfig = '' MaxLevelStore="warning" diff --git a/nixops/modules/databases/immae.schema b/nixops/modules/databases/immae.schema index f0e12bc..f5ee5d5 100644 --- a/nixops/modules/databases/immae.schema +++ b/nixops/modules/databases/immae.schema @@ -149,7 +149,19 @@ objectclass ( ImmaeobjectClass:8 NAME 'immaePuppetClass' MUST ( immaePuppetJson ) ) +attributetype (ImmaeattributeType:19 NAME 'immaeTaskId' + DESC 'Taskwarrior server Org:Name:Key' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} ) + +objectclass ( ImmaeobjectClass:9 NAME 'immaeTaskClass' + DESC 'Expansion of the existing object classes for Task' + SUP top AUXILIARY + MUST ( immaeTaskId ) + ) + # Last: -# attributetype (ImmaeattributeType:18 NAME 'immaeAccessReadSubtree' -# objectclass ( ImmaeobjectClass:8 NAME 'immaePuppetClass' +# attributetype (ImmaeattributeType:19 NAME 'immaeTaskId' +# objectclass ( ImmaeobjectClass:9 NAME 'immaeTaskClass' diff --git a/nixops/modules/task/default.nix b/nixops/modules/task/default.nix new file mode 100644 index 0000000..3dc3299 --- /dev/null +++ b/nixops/modules/task/default.nix @@ -0,0 +1,131 @@ +{ lib, pkgs, config, myconfig, mylibs, ... }: +let + cfg = config.services.myTasks; + vardir = config.services.taskserver.dataDir; + fqdn = "task.immae.eu"; + user = config.services.taskserver.user; + env = myconfig.env.tools.task; + group = config.services.taskserver.group; +in { + options.services.myTasks = { + enable = lib.mkEnableOption "my tasks service"; + }; + + config = lib.mkIf cfg.enable { + security.acme.certs."eldiron".extraDomains.${fqdn} = null; + services.myWebsites.tools.modules = [ "proxy_fcgi" ]; + services.myWebsites.tools.vhostConfs.task = { + certName = "eldiron"; + hosts = [ "task.immae.eu" ]; + root = "/run/current-system/webapps/_task"; + extraConfig = [ '' + + DirectoryIndex index.php + Use LDAPConnect + Require ldap-group cn=users,cn=taskwarrior,ou=services,dc=immae,dc=eu + + SetHandler "proxy:unix:/var/run/phpfpm/task.sock|fcgi://localhost" + + SetEnv TASKD_HOST "${fqdn}:${toString config.services.taskserver.listenPort}" + SetEnv TASKD_VARDIR "${vardir}" + SetEnv TASKD_LDAP_HOST "ldaps://${env.ldap.host}" + SetEnv TASKD_LDAP_DN "${env.ldap.dn}" + SetEnv TASKD_LDAP_PASSWORD "${env.ldap.password}" + SetEnv TASKD_LDAP_BASE "${env.ldap.base}" + SetEnv TASKD_LDAP_FILTER "${env.ldap.search}" + + '' ]; + }; + services.myPhpfpm.poolConfigs = { + tasks = '' + listen = /var/run/phpfpm/task.sock + user = ${user} + group = ${group} + listen.owner = wwwrun + listen.group = wwwrun + pm = dynamic + pm.max_children = 60 + pm.start_servers = 2 + pm.min_spare_servers = 1 + pm.max_spare_servers = 10 + + ; Needed to avoid clashes in browser cookies (same domain) + env[PATH] = "/etc/profiles/per-user/${user}/bin" + php_value[session.name] = TaskPHPSESSID + php_admin_value[open_basedir] = "${./www}:/tmp:${vardir}:/etc/profiles/per-user/${user}/bin/" + ''; + }; + + system.extraSystemBuilderCmds = '' + ln -s ${./www} $out/webapps/_task + ''; + + security.acme.certs."task" = config.services.myCertificates.certConfig // { + inherit user group; + plugins = [ "fullchain.pem" "key.pem" "cert.pem" "account_key.json" ]; + domain = fqdn; + postRun = '' + systemctl restart taskserver.service + ''; + }; + + users.users.${user}.packages = [ + (pkgs.runCommand "taskserver-user-certs" {} '' + mkdir -p $out/bin + cat > $out/bin/taskserver-user-certs <<"EOF" + #!/usr/bin/env bash + + user=$1 + + silent_certtool() { + if ! output="$("${pkgs.gnutls.bin}/bin/certtool" "$@" 2>&1)"; then + echo "GNUTLS certtool invocation failed with output:" >&2 + echo "$output" >&2 + fi + } + + silent_certtool -p \ + --bits 4096 \ + --outfile "${vardir}/userkeys/$user.key.pem" + ${pkgs.gnused}/bin/sed -i -n -e '/^-----BEGIN RSA PRIVATE KEY-----$/,$p' "${vardir}/userkeys/$user.key.pem" + + silent_certtool -c \ + --template "${pkgs.writeText "taskserver-ca.template" '' + tls_www_client + encryption_key + signing_key + expiration_days = 3650 + ''}" \ + --load-ca-certificate "${vardir}/keys/ca.cert" \ + --load-ca-privkey "${vardir}/keys/ca.key" \ + --load-privkey "${vardir}/userkeys/$user.key.pem" \ + --outfile "${vardir}/userkeys/$user.cert.pem" + EOF + chmod a+x $out/bin/taskserver-user-certs + patchShebangs $out/bin/taskserver-user-certs + '') + ]; + + systemd.services.taskserver-ca.postStart = '' + chown :${group} "${vardir}/keys/ca.key" + chmod g+r "${vardir}/keys/ca.key" + ''; + + system.activationScripts.taskserver = { + deps = [ "users" ]; + text = '' + install -m 0750 -o ${user} -g ${group} -d ${vardir} + install -m 0750 -o ${user} -g ${group} -d ${vardir}/userkeys + install -m 0750 -o ${user} -g ${group} -d ${vardir}/keys + ''; + }; + + services.taskserver = { + enable = true; + allowedClientIDs = [ "^task [2-9]" "^Mirakel [1-9]" ]; + inherit fqdn; + listenHost = "::"; + requestLimit = 104857600; + }; + }; +} diff --git a/nixops/modules/task/www/index.php b/nixops/modules/task/www/index.php new file mode 100644 index 0000000..829cdd0 --- /dev/null +++ b/nixops/modules/task/www/index.php @@ -0,0 +1,135 @@ + $value) { + if ($key !== "count") { + $entries[] = explode(":", $value); + } +} + +if (isset($_GET["file"])) { + $basecert = $vardir . "/userkeys/" . $ldap_user; + if (!file_exists($basecert . ".cert.pem")) { + exec("taskserver-user-certs $ldap_user"); + } + $certificate = file_get_contents($basecert . ".cert.pem"); + $cert_key = file_get_contents($basecert . ".key.pem"); + $server_cert = file_get_contents($vardir . "/keys/server.cert"); + + $file = $_GET["file"]; + switch($file) { + case "ca.cert.pem": + $content = $server_cert; + $name = "ca.cert.pem"; + $type = "application/x-x509-ca-cert"; + break; + case "cert.pem": + $content = $certificate; + $name = $ldap_user . ".cert.pem"; + $type = "application/x-x509-ca-cert"; + break; + case "key.pem": + $content = $cert_key; + $name = $ldap_user . ".key.pem"; + $type = "application/x-x509-ca-cert"; + break; + case "mirakel"; + foreach ($entries as $entry) { + list($org, $user, $key) = $entry; + if ($key == $_GET["key"]) { break; } + } + $name = $user . ".mirakel"; + $type = "text/plain"; + $content = "username: $user +org: $org +user key: $key +server: $host +client.cert: +$certificate +Client.key: +$cert_key +ca.cert: +$server_cert +"; + break; + default: + die("invalid file name"); + break; + } + + header("Content-Type: $type"); + header('Content-Disposition: attachment; filename="' . $name . '"'); + header('Content-Transfer-Encoding: binary'); + header('Accept-Ranges: bytes'); + header('Cache-Control: private'); + header('Pragma: private'); + echo $content; + exit; +} +?> + +
+ Taskwarrior configuration +
+ + +For command line interface, download the files, put them near your Taskwarrior +configuration files, and add that to your Taskwarrior configuration: +
+taskd.certificate=/path/to/.cert.pem
+taskd.key=/path/to/.key.pem
+taskd.server=
+ 1) {
+  echo "# Chose one of them\n";
+  foreach($entries as $entry) {
+    list($org, $user, $key) = $entry;
+    echo "# taskd.credentials=$org/$user/$key\n";
+  }
+} else { ?>
+taskd.credentials=//
+
+taskd.ca=/path/to/ca.cert.pem
+
+For Mirakel, download and import the file: + +For Android Taskwarrior app, see instructions here. + + + -- 2.41.0