canaille: 0.0.56 -> 0.0.57

nixos/modules/services/security/canaille.nix

@@ -33,9 +33,12 @@ let
       old.dependencies
       ++ old.optional-dependencies.front
       ++ old.optional-dependencies.oidc
+      ++ old.optional-dependencies.scim
       ++ old.optional-dependencies.ldap
       ++ old.optional-dependencies.sentry
-      ++ old.optional-dependencies.postgresql;
+      ++ old.optional-dependencies.postgresql
+      ++ old.optional-dependencies.otp
+      ++ old.optional-dependencies.sms;
     makeWrapperArgs = (old.makeWrapperArgs or [ ]) ++ [
       "--set CONFIG /etc/canaille/config.toml"
       "--set SECRETS_DIR \"${secretsDir}\""

pkgs/by-name/ca/canaille/package.nix

@@ -11,7 +11,7 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "canaille";
-  version = "0.0.56";
+  version = "0.0.57";
   pyproject = true;
 
   disabled = python.pythonOlder "3.10";
@@ -20,7 +20,7 @@ python.pkgs.buildPythonApplication rec {
     owner = "yaal";
     repo = "canaille";
     rev = "refs/tags/${version}";
-    hash = "sha256-cLsLwttUDxMKVqtVDCY5A22m1YY1UezeZQh1j74WzgU=";
+    hash = "sha256-pesN7k5kGHi3dqTMaXWdCsNsnaJxXv/Ku1wVC9N9a3k=";
   };
 
   build-system = with python.pkgs; [
@@ -35,6 +35,7 @@ python.pkgs.buildPythonApplication rec {
       flask
       flask-wtf
       pydantic-settings
+      requests
       wtforms
     ]
     ++ sentry-sdk.optional-dependencies.flask;
@@ -51,15 +52,19 @@ python.pkgs.buildPythonApplication rec {
       pytest-lazy-fixtures
       pytest-smtpd
       pytest-xdist
+      scim2-tester
       slapd
       toml
       faker
       time-machine
     ]
     ++ optional-dependencies.front
     ++ optional-dependencies.oidc
+    ++ optional-dependencies.scim
     ++ optional-dependencies.ldap
-    ++ optional-dependencies.postgresql;
+    ++ optional-dependencies.postgresql
+    ++ optional-dependencies.otp
+    ++ optional-dependencies.sms;
 
   postInstall = ''
     mkdir -p $out/etc/schema
@@ -88,14 +93,24 @@ python.pkgs.buildPythonApplication rec {
       zxcvbn-rs-py
     ];
     oidc = [ authlib ];
+    scim = [
+      scim2-models
+      authlib
+    ];
     ldap = [ python-ldap ];
     sentry = [ sentry-sdk ];
     postgresql = [
       passlib
       sqlalchemy
       sqlalchemy-json
       sqlalchemy-utils
-    ] ++ sqlalchemy.optional-dependencies.postgresql;
+    ] ++ sqlalchemy.optional-dependencies.postgresql_psycopg2binary;
+    otp = [
+      otpauth
+      pillow
+      qrcode
+    ];
+    sms = [ smpplib ];
   };
 
   passthru = {

pkgs/development/python-modules/otpauth/default.nix

@@ -0,0 +1,36 @@
+{
+  lib,
+  buildPythonPackage,
+  pythonOlder,
+  fetchPypi,
+  setuptools,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "otpauth";
+  version = "2.1.1";
+
+  pyproject = true;
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-4J7WOgGzWs14t7sPmB/c29HZ2cAb4aPg1wJMZdDnTio=";
+  };
+
+  build-system = [ setuptools ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ pname ];
+
+  meta = with lib; {
+    description = "Implements one time password of HOTP/TOTP";
+    homepage = "https://otp.authlib.org/";
+    changelog = "https://github.com/authlib/otpauth/releases/tag/v${version}";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ erictapen ];
+  };
+}

pkgs/development/python-modules/scim2-client/default.nix

@@ -0,0 +1,64 @@
+{
+  lib,
+  buildPythonPackage,
+  pythonOlder,
+  fetchPypi,
+  hatchling,
+  scim2-models,
+  pytestCheckHook,
+  portpicker,
+  pytest-httpserver,
+  pytest-asyncio,
+  scim2-server,
+  httpx,
+  werkzeug,
+}:
+
+buildPythonPackage rec {
+  pname = "scim2-client";
+  version = "0.5.1";
+
+  pyproject = true;
+
+  disabled = pythonOlder "3.9";
+
+  src = fetchPypi {
+    inherit version;
+    pname = "scim2_client";
+    hash = "sha256-g2RR+Ruvjw88cGHcwEPoktTmB8VcWAPnea3BErS8JyI=";
+  };
+
+  build-system = [ hatchling ];
+
+  dependencies = [ scim2-models ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    portpicker
+    pytest-httpserver
+    pytest-asyncio
+    scim2-server
+    werkzeug
+  ] ++ optional-dependencies.httpx;
+
+  # Werkzeug returns 500, didn't deem it worth it to investigate
+  disabledTests = [
+    "test_search_request"
+    "test_query_dont_check_request_payload"
+  ];
+
+  pythonImportsCheck = [ "scim2_client" ];
+
+  optional-dependencies = {
+    httpx = [ httpx ];
+    werkzeug = [ werkzeug ];
+  };
+
+  meta = with lib; {
+    description = "Pythonically build SCIM requests and parse SCIM responses";
+    homepage = "https://scim2-client.readthedocs.io/";
+    changelog = "https://github.com/python-scim/scim2-client/releases/tag/${version}";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ erictapen ];
+  };
+}

pkgs/development/python-modules/scim2-models/default.nix

@@ -0,0 +1,40 @@
+{
+  lib,
+  buildPythonPackage,
+  pythonOlder,
+  fetchPypi,
+  hatchling,
+  pydantic,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "scim2-models";
+  version = "0.3.0";
+
+  pyproject = true;
+
+  disabled = pythonOlder "3.9";
+
+  src = fetchPypi {
+    inherit version;
+    pname = "scim2_models";
+    hash = "sha256-odtiOF54IOZ8lP11gkaBU5frOzvRvKeXoqPvNG6B2Cc=";
+  };
+
+  build-system = [ hatchling ];
+
+  dependencies = [ pydantic ] ++ pydantic.optional-dependencies.email;
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "scim2_models" ];
+
+  meta = with lib; {
+    description = "SCIM2 models serialization and validation with pydantic";
+    homepage = "https://github.com/python-scim/scim2-models";
+    changelog = "https://github.com/python-scim/scim2-models/releases/tag/${version}";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ erictapen ];
+  };
+}

pkgs/development/python-modules/scim2-server/default.nix

@@ -0,0 +1,49 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  hatchling,
+  scim2-filter-parser,
+  scim2-models,
+  werkzeug,
+  pytestCheckHook,
+  httpx,
+  time-machine,
+}:
+
+buildPythonPackage rec {
+  pname = "scim2-server";
+  version = "0.1.2";
+
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit version;
+    pname = "scim2_server";
+    hash = "sha256-6MHQVo0vqJ/69iBz3GtH1f2YO/Vh/MORSkEETwy/9pE=";
+  };
+
+  build-system = [ hatchling ];
+
+  dependencies = [
+    scim2-filter-parser
+    scim2-models
+    werkzeug
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    httpx
+    time-machine
+  ];
+
+  pythonImportsCheck = [ "scim2_server" ];
+
+  meta = with lib; {
+    description = "Lightweight SCIM2 server prototype";
+    homepage = "https://github.com/python-scim/scim2-server";
+    changelog = "https://github.com/python-scim/scim2-server/releases/tag/${version}";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ erictapen ];
+  };
+}

pkgs/development/python-modules/scim2-tester/default.nix

@@ -0,0 +1,50 @@
+{
+  lib,
+  buildPythonPackage,
+  pythonOlder,
+  fetchPypi,
+  hatchling,
+  scim2-client,
+  pytestCheckHook,
+  werkzeug,
+  scim2-server,
+  pytest-httpserver,
+}:
+
+buildPythonPackage rec {
+  pname = "scim2-tester";
+  version = "0.1.13";
+
+  pyproject = true;
+
+  disabled = pythonOlder "3.10";
+
+  src = fetchPypi {
+    inherit version;
+    pname = "scim2_tester";
+    hash = "sha256-Jpfxyok46fRCW3aAOFb0BTEI++Ou5lob/0RsoXgzkxk=";
+  };
+
+  build-system = [ hatchling ];
+
+  dependencies = [ scim2-client ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    werkzeug
+    scim2-server
+    pytest-httpserver
+  ] ++ optional-dependencies.httpx;
+
+  pythonImportsCheck = [ "scim2_tester" ];
+
+  optional-dependencies.httpx = scim2-client.optional-dependencies.httpx;
+
+  meta = with lib; {
+    description = "SCIM RFCs server compliance checker";
+    homepage = "https://scim2-tester.readthedocs.io/";
+    changelog = "https://github.com/python-scim/scim2-tester/releases/tag/${version}";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ erictapen ];
+  };
+}

pkgs/development/python-modules/zxcvbn-rs-py/default.nix

@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "zxcvbn-rs-py";
-  version = "0.1.1";
+  version = "0.2.0";
 
   pyproject = true;
 
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "zxcvbn_rs_py";
     inherit version;
-    hash = "sha256-7EZJ/WGekfsnisqTs9dwwbQia6OlDEx3MR9mkqSI+gA=";
+    hash = "sha256-DQzdOngHGZma2NyfrNuMppG6GzpGoKfwVQGUVmN7erA=";
   };
 
   build-system = [
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   cargoDeps = rustPlatform.fetchCargoTarball {
     name = "${pname}-${version}";
     inherit src;
-    hash = "sha256-OA6iyojBMAG9GtjHaIQ9cM0SEMwMa2bKFRIXmqp4OBE=";
+    hash = "sha256-tb0puFu4T3KW75U7GXjYzjH72diH/tboSwmpnkGwG0k=";
   };
 
   pythonImportsCheck = [ "zxcvbn_rs_py" ];

pkgs/top-level/python-packages.nix

@@ -9868,6 +9868,8 @@ self: super: with self; {
 
   osxphotos = callPackage ../development/python-modules/osxphotos { };
 
+  otpauth = callPackage ../development/python-modules/otpauth { };
+
   ots-python = callPackage ../development/python-modules/ots-python { };
 
   outcome = callPackage ../development/python-modules/outcome { };
@@ -14433,8 +14435,16 @@ self: super: with self; {
 
   scienceplots = callPackage ../development/python-modules/scienceplots { };
 
+  scim2-client = callPackage ../development/python-modules/scim2-client { };
+
   scim2-filter-parser = callPackage ../development/python-modules/scim2-filter-parser { };
 
+  scim2-models = callPackage ../development/python-modules/scim2-models { };
+
+  scim2-server = callPackage ../development/python-modules/scim2-server { };
+
+  scim2-tester = callPackage ../development/python-modules/scim2-tester { };
+
   scikit-bio = callPackage ../development/python-modules/scikit-bio { };
 
   scikit-build = callPackage ../development/python-modules/scikit-build { };