commit 9545fade8bb37ed7d6d722ff7cc5f5156e48c7d4 · pyrox.dev/nixpkgs

+11

nixos/doc/manual/from_md/release-notes/rl-2111.section.xml

···

       558
       558
        
             </listitem>

     

       559
       559
        
             <listitem>

     

       560
       560
        
               <para>

     

       561
       561
       +
                 <literal>ihatemoney</literal> has been updated to version

     

       562
       562
       +
                 5.1.1

     

       563
       563
       +
                 (<link xlink:href="https://github.com/spiral-project/ihatemoney/blob/5.1.1/CHANGELOG.rst">release

     

       564
       564
       +
                 notes</link>). If you serve ihatemoney by HTTP rather than

     

       565
       565
       +
                 HTTPS, you must set

     

       566
       566
       +
                 <link xlink:href="options.html#opt-services.ihatemoney.secureCookie">services.ihatemoney.secureCookie</link>

     

       567
       567
       +
                 to <literal>false</literal>.

     

       568
       568
       +
               </para>

     

       569
       569
       +
             </listitem>

     

       570
       570
       +
             <listitem>

     

       571
       571
       +
               <para>

     

       561
       572
        
                 PHP 7.3 is no longer supported due to upstream not supporting

     

       562
       573
        
                 this version for the entire lifecycle of the 21.11 release.

     

       563
       574
        
               </para>

nixos/doc/manual/release-notes/rl-2111.section.md

···

       204
       204
        
       

     

       205
       205
        
       - `services.geoip-updater` was broken and has been replaced by [services.geoipupdate](options.html#opt-services.geoipupdate.enable).

     

       206
       206
        
       

     

       207
       207
       +
       - `ihatemoney` has been updated to version 5.1.1 ([release notes](https://github.com/spiral-project/ihatemoney/blob/5.1.1/CHANGELOG.rst)). If you serve ihatemoney by HTTP rather than HTTPS, you must set [services.ihatemoney.secureCookie](options.html#opt-services.ihatemoney.secureCookie) to `false`.

     

       208
       208
       +
       

     

       207
       209
        
       - PHP 7.3 is no longer supported due to upstream not supporting this version for the entire lifecycle of the 21.11 release.

     

       208
       210
        
       

     

       209
       211
        
       - Those making use of `buildBazelPackage` will need to regenerate the fetch hashes (preferred), or set `fetchConfigured = false;`.

+16 -2

nixos/modules/services/web-apps/ihatemoney/default.nix

···

       33
       33
        
                 then "sqlite:////var/lib/ihatemoney/ihatemoney.sqlite"

     

       34
       34
        
                 else "postgresql:///${db}"}'

     

       35
       35
        
               SQLALCHEMY_TRACK_MODIFICATIONS = False

     

       36
       36
       -
               MAIL_DEFAULT_SENDER = ("${cfg.defaultSender.name}", "${cfg.defaultSender.email}")

     

       36
       36
       +
               MAIL_DEFAULT_SENDER = (r"${cfg.defaultSender.name}", r"${cfg.defaultSender.email}")

     

       37
       37
        
               ACTIVATE_DEMO_PROJECT = ${toBool cfg.enableDemoProject}

     

       38
       38
       -
               ADMIN_PASSWORD = "${toString cfg.adminHashedPassword /*toString null == ""*/}"

     

       38
       38
       +
               ADMIN_PASSWORD = r"${toString cfg.adminHashedPassword /*toString null == ""*/}"

     

       39
       39
        
               ALLOW_PUBLIC_PROJECT_CREATION = ${toBool cfg.enablePublicProjectCreation}

     

       40
       40
        
               ACTIVATE_ADMIN_DASHBOARD = ${toBool cfg.enableAdminDashboard}

     

       41
       41
       +
               SESSION_COOKIE_SECURE = ${toBool cfg.secureCookie}

     

       42
       42
       +
               ENABLE_CAPTCHA = ${toBool cfg.enableCaptcha}

     

       43
       43
       +
               LEGAL_LINK = r"${toString cfg.legalLink}"

     

       41
       44
        
       

     

       42
       45
        
               ${cfg.extraConfig}

     

       43
       46
        
         '';

     
···

       79
       82
        
                 description = "The email of the sender of ihatemoney emails";

     

       80
       83
        
               };

     

       81
       84
        
             };

     

       85
       85
       +
             secureCookie = mkOption {

     

       86
       86
       +
               type = types.bool;

     

       87
       87
       +
               default = true;

     

       88
       88
       +
               description = "Use secure cookies. Disable this when ihatemoney is served via http instead of https";

     

       89
       89
       +
             };

     

       82
       90
        
             enableDemoProject = mkEnableOption "access to the demo project in ihatemoney";

     

       83
       91
        
             enablePublicProjectCreation = mkEnableOption "permission to create projects in ihatemoney by anyone";

     

       84
       92
        
             enableAdminDashboard = mkEnableOption "ihatemoney admin dashboard";

     

       93
       93
       +
             enableCaptcha = mkEnableOption "a simplistic captcha for some forms";

     

       94
       94
       +
             legalLink = mkOption {

     

       95
       95
       +
               type = types.nullOr types.str;

     

       96
       96
       +
               default = null;

     

       97
       97
       +
               description = "The URL to a page explaining legal statements about your service, eg. GDPR-related information.";

     

       98
       98
       +
             };

     

       85
       99
        
             extraConfig = mkOption {

     

       86
       100
        
               type = types.str;

     

       87
       101
        
               default = "";

+1 -1

nixos/tests/all-tests.nix

···

       191
       191
        
         i3wm = handleTest ./i3wm.nix {};

     

       192
       192
        
         icingaweb2 = handleTest ./icingaweb2.nix {};

     

       193
       193
        
         iftop = handleTest ./iftop.nix {};

     

       194
       194
       -
         ihatemoney = handleTest ./ihatemoney.nix {};

     

       194
       194
       +
         ihatemoney = handleTest ./ihatemoney {};

     

       195
       195
        
         incron = handleTest ./incron.nix {};

     

       196
       196
        
         influxdb = handleTest ./influxdb.nix {};

     

       197
       197
        
         initrd-network-openvpn = handleTest ./initrd-network-openvpn {};

-62

nixos/tests/ihatemoney.nix

···

       1
       1
       -
       { system ? builtins.currentSystem,

     

       2
       2
       -
         config ? {},

     

       3
       3
       -
         pkgs ? import ../.. { inherit system config; }

     

       4
       4
       -
       }:

     

       5
       5
       -
       

     

       6
       6
       -
       let

     

       7
       7
       -
         inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest;

     

       8
       8
       -
         f = backend: makeTest {

     

       9
       9
       -
           name = "ihatemoney-${backend}";

     

       10
       10
       -
           machine = { lib, ... }: {

     

       11
       11
       -
             services.ihatemoney = {

     

       12
       12
       -
               enable = true;

     

       13
       13
       -
               enablePublicProjectCreation = true;

     

       14
       14
       -
               inherit backend;

     

       15
       15
       -
               uwsgiConfig = {

     

       16
       16
       -
                 http = ":8000";

     

       17
       17
       -
               };

     

       18
       18
       -
             };

     

       19
       19
       -
             boot.cleanTmpDir = true;

     

       20
       20
       -
             # ihatemoney needs a local smtp server otherwise project creation just crashes

     

       21
       21
       -
             services.opensmtpd = {

     

       22
       22
       -
               enable = true;

     

       23
       23
       -
               serverConfiguration = ''

     

       24
       24
       -
                 listen on lo

     

       25
       25
       -
                 action foo relay

     

       26
       26
       -
                 match from any for any action foo

     

       27
       27
       -
               '';

     

       28
       28
       -
             };

     

       29
       29
       -
           };

     

       30
       30
       -
           testScript = ''

     

       31
       31
       -
             machine.wait_for_open_port(8000)

     

       32
       32
       -
             machine.wait_for_unit("uwsgi.service")

     

       33
       33
       -
             machine.wait_until_succeeds("curl http://localhost:8000")

     

       34
       34
       -
       

     

       35
       35
       -
             assert '"yay"' in machine.succeed(

     

       36
       36
       -
                 "curl -X POST http://localhost:8000/api/projects -d 'name=yay&id=yay&password=yay&contact_email=yay@example.com'"

     

       37
       37
       -
             )

     

       38
       38
       -
             owner, timestamp = machine.succeed(

     

       39
       39
       -
                 "stat --printf %U:%G___%Y /var/lib/ihatemoney/secret_key"

     

       40
       40
       -
             ).split("___")

     

       41
       41
       -
             assert "ihatemoney:ihatemoney" == owner

     

       42
       42
       -
       

     

       43
       43
       -
             with subtest("Restart machine and service"):

     

       44
       44
       -
                 machine.shutdown()

     

       45
       45
       -
                 machine.start()

     

       46
       46
       -
                 machine.wait_for_open_port(8000)

     

       47
       47
       -
                 machine.wait_for_unit("uwsgi.service")

     

       48
       48
       -
       

     

       49
       49
       -
             with subtest("check that the database is really persistent"):

     

       50
       50
       -
                 machine.succeed("curl --basic -u yay:yay http://localhost:8000/api/projects/yay")

     

       51
       51
       -
       

     

       52
       52
       -
             with subtest("check that the secret key is really persistent"):

     

       53
       53
       -
                 timestamp2 = machine.succeed("stat --printf %Y /var/lib/ihatemoney/secret_key")

     

       54
       54
       -
                 assert timestamp == timestamp2

     

       55
       55
       -
       

     

       56
       56
       -
             assert "ihatemoney" in machine.succeed("curl http://localhost:8000")

     

       57
       57
       -
           '';

     

       58
       58
       -
         };

     

       59
       59
       -
       in {

     

       60
       60
       -
         ihatemoney-sqlite = f "sqlite";

     

       61
       61
       -
         ihatemoney-postgresql = f "postgresql";

     

       62
       62
       -
       }

+78

nixos/tests/ihatemoney/default.nix

···

       1
       1
       +
       { system ? builtins.currentSystem,

     

       2
       2
       +
         config ? {},

     

       3
       3
       +
         pkgs ? import ../../.. { inherit system config; }

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       6
       6
       +
       let

     

       7
       7
       +
         inherit (import ../../lib/testing-python.nix { inherit system pkgs; }) makeTest;

     

       8
       8
       +
         f = backend: makeTest {

     

       9
       9
       +
           name = "ihatemoney-${backend}";

     

       10
       10
       +
           machine = { nodes, lib, ... }: {

     

       11
       11
       +
             services.ihatemoney = {

     

       12
       12
       +
               enable = true;

     

       13
       13
       +
               enablePublicProjectCreation = true;

     

       14
       14
       +
               secureCookie = false;

     

       15
       15
       +
               inherit backend;

     

       16
       16
       +
               uwsgiConfig = {

     

       17
       17
       +
                 http = ":8000";

     

       18
       18
       +
               };

     

       19
       19
       +
             };

     

       20
       20
       +
             boot.cleanTmpDir = true;

     

       21
       21
       +
             # for exchange rates

     

       22
       22
       +
             security.pki.certificateFiles = [ ./server.crt ];

     

       23
       23
       +
             networking.extraHosts = "127.0.0.1 api.exchangerate.host";

     

       24
       24
       +
             services.nginx = {

     

       25
       25
       +
               enable = true;

     

       26
       26
       +
               virtualHosts."api.exchangerate.host" = {

     

       27
       27
       +
                 addSSL = true;

     

       28
       28
       +
                 # openssl req -x509 -newkey rsa:4096 -keyout server.key -out server.crt -days 1000000 -nodes -subj '/CN=api.exchangerate.host'

     

       29
       29
       +
                 sslCertificate = ./server.crt;

     

       30
       30
       +
                 sslCertificateKey = ./server.key;

     

       31
       31
       +
                 locations."/".return = "200 '${builtins.readFile ./rates.json}'";

     

       32
       32
       +
               };

     

       33
       33
       +
             };

     

       34
       34
       +
             # ihatemoney needs a local smtp server otherwise project creation just crashes

     

       35
       35
       +
             services.opensmtpd = {

     

       36
       36
       +
               enable = true;

     

       37
       37
       +
               serverConfiguration = ''

     

       38
       38
       +
                 listen on lo

     

       39
       39
       +
                 action foo relay

     

       40
       40
       +
                 match from any for any action foo

     

       41
       41
       +
               '';

     

       42
       42
       +
             };

     

       43
       43
       +
           };

     

       44
       44
       +
           testScript = ''

     

       45
       45
       +
             machine.wait_for_open_port(8000)

     

       46
       46
       +
             machine.wait_for_unit("uwsgi.service")

     

       47
       47
       +
             machine.wait_until_succeeds("curl --fail https://api.exchangerate.host")

     

       48
       48
       +
             machine.wait_until_succeeds("curl --fail http://localhost:8000")

     

       49
       49
       +
       

     

       50
       50
       +
             result = machine.succeed(

     

       51
       51
       +
                 "curl --fail -X POST http://localhost:8000/api/projects -d 'name=yay&id=yay&password=yay&contact_email=yay@example.com&default_currency=XXX'"

     

       52
       52
       +
             )

     

       53
       53
       +
             assert '"yay"' in result, repr(result)

     

       54
       54
       +
             owner, timestamp = machine.succeed(

     

       55
       55
       +
                 "stat --printf %U:%G___%Y /var/lib/ihatemoney/secret_key"

     

       56
       56
       +
             ).split("___")

     

       57
       57
       +
             assert "ihatemoney:ihatemoney" == owner

     

       58
       58
       +
       

     

       59
       59
       +
             with subtest("Restart machine and service"):

     

       60
       60
       +
                 machine.shutdown()

     

       61
       61
       +
                 machine.start()

     

       62
       62
       +
                 machine.wait_for_open_port(8000)

     

       63
       63
       +
                 machine.wait_for_unit("uwsgi.service")

     

       64
       64
       +
       

     

       65
       65
       +
             with subtest("check that the database is really persistent"):

     

       66
       66
       +
                 machine.succeed("curl --fail --basic -u yay:yay http://localhost:8000/api/projects/yay")

     

       67
       67
       +
       

     

       68
       68
       +
             with subtest("check that the secret key is really persistent"):

     

       69
       69
       +
                 timestamp2 = machine.succeed("stat --printf %Y /var/lib/ihatemoney/secret_key")

     

       70
       70
       +
                 assert timestamp == timestamp2

     

       71
       71
       +
       

     

       72
       72
       +
             assert "ihatemoney" in machine.succeed("curl --fail http://localhost:8000")

     

       73
       73
       +
           '';

     

       74
       74
       +
         };

     

       75
       75
       +
       in {

     

       76
       76
       +
         ihatemoney-sqlite = f "sqlite";

     

       77
       77
       +
         ihatemoney-postgresql = f "postgresql";

     

       78
       78
       +
       }

+39

nixos/tests/ihatemoney/rates.json

···

       1
       1
       +
       {

     

       2
       2
       +
         "rates": {

     

       3
       3
       +
           "CAD": 1.3420055134,

     

       4
       4
       +
           "HKD": 7.7513783598,

     

       5
       5
       +
           "ISK": 135.9407305307,

     

       6
       6
       +
           "PHP": 49.3762922123,

     

       7
       7
       +
           "DKK": 6.4126464507,

     

       8
       8
       +
           "HUF": 298.9145416954,

     

       9
       9
       +
           "CZK": 22.6292212267,

     

       10
       10
       +
           "GBP": 0.7838128877,

     

       11
       11
       +
           "RON": 4.1630771881,

     

       12
       12
       +
           "SEK": 8.8464851826,

     

       13
       13
       +
           "IDR": 14629.5658166782,

     

       14
       14
       +
           "INR": 74.8328738801,

     

       15
       15
       +
           "BRL": 5.2357856651,

     

       16
       16
       +
           "RUB": 71.8416609235,

     

       17
       17
       +
           "HRK": 6.4757064094,

     

       18
       18
       +
           "JPY": 106.2715368711,

     

       19
       19
       +
           "THB": 31.7203652653,

     

       20
       20
       +
           "CHF": 0.9243625086,

     

       21
       21
       +
           "EUR": 0.8614748449,

     

       22
       22
       +
           "MYR": 4.2644727774,

     

       23
       23
       +
           "BGN": 1.6848725017,

     

       24
       24
       +
           "TRY": 6.8483804273,

     

       25
       25
       +
           "CNY": 7.0169710544,

     

       26
       26
       +
           "NOK": 9.213731909,

     

       27
       27
       +
           "NZD": 1.5080978635,

     

       28
       28
       +
           "ZAR": 16.7427636113,

     

       29
       29
       +
           "USD": 1,

     

       30
       30
       +
           "MXN": 22.4676085458,

     

       31
       31
       +
           "SGD": 1.3855099931,

     

       32
       32
       +
           "AUD": 1.4107512061,

     

       33
       33
       +
           "ILS": 3.4150585803,

     

       34
       34
       +
           "KRW": 1203.3339076499,

     

       35
       35
       +
           "PLN": 3.794452102

     

       36
       36
       +
         },

     

       37
       37
       +
         "base": "USD",

     

       38
       38
       +
         "date": "2020-07-24"

     

       39
       39
       +
       }

+28

nixos/tests/ihatemoney/server.crt

···

       1
       1
       +
       -----BEGIN CERTIFICATE-----

     

       2
       2
       +
       MIIEvjCCAqYCCQDkTQrENPCZjjANBgkqhkiG9w0BAQsFADAgMR4wHAYDVQQDDBVh

     

       3
       3
       +
       cGkuZXhjaGFuZ2VyYXRlLmhvc3QwIBcNMjEwNzE0MTI1MzQ0WhgPNDc1OTA2MTEx

     

       4
       4
       +
       MjUzNDRaMCAxHjAcBgNVBAMMFWFwaS5leGNoYW5nZXJhdGUuaG9zdDCCAiIwDQYJ

     

       5
       5
       +
       KoZIhvcNAQEBBQADggIPADCCAgoCggIBAL5zpwUYa/ySqvJ/PUnXYsl1ww5SNGJh

     

       6
       6
       +
       NujCRxC0Gw+5t5O7USSHRdz7Eb2PNFMa7JR+lliLAWdjHfqPXJWmP10X5ebvyxeQ

     

       7
       7
       +
       TJkR1HpDSY6TQQlJvwr/JNGryyoQYjXvnyeyVu4TS3U0TTI631OonDAj+HbFIs9L

     

       8
       8
       +
       gr/HfHzFmxRVLwaJ7hebanihc5RzoWTxgswiOwYQu5AivXQqcvUIxELeT7CxWwiw

     

       9
       9
       +
       be/SlalDgoezB/poqaa215FUuN2av+nTn+swH3WOi9kwePLgVKn9BnDMwyh8et13

     

       10
       10
       +
       yt27RWCSOcZagRSYsSbBaEJbClZvnuYvDqooJEy0GVbGBZpClKRKe92yd0PTf3ZJ

     

       11
       11
       +
       GupyNoCFQlGugY//WLrsPv/Q4WwP+qZ6t97sV0CdM+epKVde/LfPKn+tFMv86qIg

     

       12
       12
       +
       Q/uGHdDwUI8XH2EysAavhdlssSrovmpl4hyo9UkzTWfJgAbmOZY3Vba41wsq12FT

     

       13
       13
       +
       usDsswGLBD10MdXWltR/Hdk8OnosLmeJxfZODAv31KSfd+4b6Ntr9BYQvAQSO+1/

     

       14
       14
       +
       Mf7gEQtNhO003VKIyV5cpH4kVQieEcvoEKgq32NVBSKVf6UIPWIefu19kvrttaUu

     

       15
       15
       +
       Q2QW2Qm4Ph/4cWpxl0jcrN5rjmgaBtIMmKYjRIS0ThDWzfVkJdmJuATzExJAplLN

     

       16
       16
       +
       nYPBG3gOtQQpAgMBAAEwDQYJKoZIhvcNAQELBQADggIBAJzt/aN7wl88WrvBasVi

     

       17
       17
       +
       fSJmJjRaW2rYyBUMptQNkm9ElHN2eQQxJgLi8+9ArQxuGKhHx+D1wMGF8w2yOp0j

     

       18
       18
       +
       4atfbXDcT+cTQY55qdEeYgU8KhESHHGszGsUpv7hzU2cACZiXG0YbOmORFYcn49Z

     

       19
       19
       +
       yPyN98kW8BViLzNF9v+I/NJPuaaCeWKjXCqY2GCzddiuotrlLtz0CODXZJ506I1F

     

       20
       20
       +
       38vQgZb10yAe6+R4y0BK7sUlmfr9BBqVcDQ/z74Kph1aB32zwP8KrNitwG1Tyk6W

     

       21
       21
       +
       rxD1dStEQyX8uDPAspe2JrToMWsOMje9F5lotmuzyvwRJYfAav300EtIggBqpiHR

     

       22
       22
       +
       o0P/1xxBzmaCHxEUJegdoYg8Q27llqsjR2T78uv/BlxpX9Dv5kNex5EZThKqyz4a

     

       23
       23
       +
       Fn1VqiA3D9IsvxH4ud+8eDaP24u1yYObSTDIBsw9xDvoV8fV+NWoNNhcAL5GwC0P

     

       24
       24
       +
       Goh7/brZSHUprxGpwRB524E//8XmCsRd/+ShtXbi4gEODMH4xLdkD7fZIJC4eG1H

     

       25
       25
       +
       GOVc1MwjiYvbQlPs6MOcQ0iKQneSlaEJmyyO5Ro5OKiKj89Az/mLYX3R17AIsu0T

     

       26
       26
       +
       Q5pGcmhKVRyu0zXvkGfK352TLwoe+4vbmakDq21Pkkcy8V9M4wP+vpCfQkg1REQ1

     

       27
       27
       +
       +mr1Vg+SFya3mlCxpFTy3j8E

     

       28
       28
       +
       -----END CERTIFICATE-----

+52

nixos/tests/ihatemoney/server.key

···

       1
       1
       +
       -----BEGIN PRIVATE KEY-----

     

       2
       2
       +
       MIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQC+c6cFGGv8kqry

     

       3
       3
       +
       fz1J12LJdcMOUjRiYTbowkcQtBsPubeTu1Ekh0Xc+xG9jzRTGuyUfpZYiwFnYx36

     

       4
       4
       +
       j1yVpj9dF+Xm78sXkEyZEdR6Q0mOk0EJSb8K/yTRq8sqEGI1758nslbuE0t1NE0y

     

       5
       5
       +
       Ot9TqJwwI/h2xSLPS4K/x3x8xZsUVS8Gie4Xm2p4oXOUc6Fk8YLMIjsGELuQIr10

     

       6
       6
       +
       KnL1CMRC3k+wsVsIsG3v0pWpQ4KHswf6aKmmtteRVLjdmr/p05/rMB91jovZMHjy

     

       7
       7
       +
       4FSp/QZwzMMofHrdd8rdu0VgkjnGWoEUmLEmwWhCWwpWb57mLw6qKCRMtBlWxgWa

     

       8
       8
       +
       QpSkSnvdsndD0392SRrqcjaAhUJRroGP/1i67D7/0OFsD/qmerfe7FdAnTPnqSlX

     

       9
       9
       +
       Xvy3zyp/rRTL/OqiIEP7hh3Q8FCPFx9hMrAGr4XZbLEq6L5qZeIcqPVJM01nyYAG

     

       10
       10
       +
       5jmWN1W2uNcLKtdhU7rA7LMBiwQ9dDHV1pbUfx3ZPDp6LC5nicX2TgwL99Skn3fu

     

       11
       11
       +
       G+jba/QWELwEEjvtfzH+4BELTYTtNN1SiMleXKR+JFUInhHL6BCoKt9jVQUilX+l

     

       12
       12
       +
       CD1iHn7tfZL67bWlLkNkFtkJuD4f+HFqcZdI3Kzea45oGgbSDJimI0SEtE4Q1s31

     

       13
       13
       +
       ZCXZibgE8xMSQKZSzZ2DwRt4DrUEKQIDAQABAoICAQCpwU465XTDUTvcH/vSCJB9

     

       14
       14
       +
       /2BYMH+OvRYDS7+qLM7+Kkxt+oWt6IEmIgfDDZTXCmWbSmXaEDS1IYzEG+qrXN6X

     

       15
       15
       +
       rMh4Gn7MxwrvWQwp2jYDRk+u5rPJKnh4Bwd0u9u+NZKIAJcpZ7tXgcHZJs6Os/hb

     

       16
       16
       +
       lIRP4RFQ8f5d0IKueDftXKwoyOKW2imB0m7CAHr4DajHKS+xDVMRe1Wg6IFE1YaS

     

       17
       17
       +
       D7O6S6tXyGKFZA+QKqN7LuHKmmW1Or5URM7uf5PV6JJfQKqZzu/qLCFyYvA0AFsw

     

       18
       18
       +
       SeMeAC5HnxIMp3KETHIA0gTCBgPJBpVWp+1D9AQPKhyJIHSShekcBi9SO0xgUB+s

     

       19
       19
       +
       h1UEcC2zf95Vson0KySX9zWRUZkrU8/0KYhYljN2/vdW8XxkRBC0pl3xWzq2kMgz

     

       20
       20
       +
       SscZqI/MzyeUHaQno62GRlWn+WKP2NidDfR0Td/ybge1DJX+aDIfjalfCEIbJeqm

     

       21
       21
       +
       BHn0CZ5z1RofatDlPj4p8+f2Trpcz/JCVKbGiQXi/08ZlCwkSIiOIcBVvAFErWop

     

       22
       22
       +
       GJOBDU3StS/MXhQVb8ZeCkPBz0TM24Sv1az/MuW4w8gavpQuBC4aD5zY/TOwG8ei

     

       23
       23
       +
       6S1sAZ0G2uc1A0FOngNvOyYYv+LImZKkWGXrLCRsqq6o/mh3M8bCHEY/lOZW8ZpL

     

       24
       24
       +
       FCsDOO8deVZl/OX1VtB0bQKCAQEA3qRWDlUpCAU8BKa5Z1oRUz06e5KD58t2HpG8

     

       25
       25
       +
       ndM3UO/F1XNB/6OGMWpL/XuBKOnWIB39UzsnnEtehKURTqqAsB1K3JQ5Q/FyuXRj

     

       26
       26
       +
       +o7XnNXe5lHBL5JqBIoESDchSAooQhBlQSjLSL2lg//igk0puv08wMK7UtajkV7U

     

       27
       27
       +
       35WDa6ks6jfoSeuVibfdobkTgfw5edirOBE2Q0U2KtGsnyAzsM6tRbtgI1Yhg7eX

     

       28
       28
       +
       nSIc4IYgq2hNLBKsegeiz1w4M6O4CQDVYFWKHyKpdrvj/fG7YZMr6YtTkuC+QPDK

     

       29
       29
       +
       mmQIEL/lj8E26MnPLKtnTFc06LQry2V3pLWNf4mMLPNLEupEXwKCAQEA2vyg8Npn

     

       30
       30
       +
       EZRunIr51rYScC6U6iryDjJWCwJxwr8vGU+bkqUOHTl3EqZOi5tDeYJJ+WSBqjfW

     

       31
       31
       +
       IWrPRFZzTITlAslZ02DQ5enS9PwgUUjl7LUEbHHh+fSNIgkVfDhsuNKFzcEaIM1X

     

       32
       32
       +
       Dl4lI2T8jEzmBep+k8f6gNmgKBgqlCf7XraorIM5diLFzy2G10zdOQTw5hW3TsVY

     

       33
       33
       +
       d968YpfC5j57/hCrf36ahIT7o1vxLD+L27Mm9Eiib45woWjaAR1Nc9kUjqY4yV7t

     

       34
       34
       +
       3QOw/Id9+/Sx5tZftOBvHlFyz23e1yaI3VxsiLDO9RxJwAKyA+KOvAybE2VU28hI

     

       35
       35
       +
       s5tAYOMV6BpEdwKCAQBqRIQyySERi/YOvkmGdC4KzhHJA7DkBXA2vRcLOdKQVjHW

     

       36
       36
       +
       ZPIeg728fmEQ90856QrkP4w3mueYKT1PEL7HDojoBsNBr5n5vRgmPtCtulpdqJOA

     

       37
       37
       +
       2YrdGwRxcDMFCRNgoECA7/R0enU1HhgPfiZuTUha0R6bXxcsPfjKnTn8EhAtZg1j

     

       38
       38
       +
       KhY8mi7BEjq+Q2l1RJ9mci2fUE/XIgTtwTCkrykc/jkkLICBvU234fyC6tJftIWJ

     

       39
       39
       +
       avpSzAL5KAXk9b55n25rFbPDDHEl1VSPsLTs8+GdfDKcgXz9gTouIwCBWreizwVS

     

       40
       40
       +
       bUW5LQIu7w0aGhHN9JlmtuK5glKsikmW9vVhbOH/AoIBAE//O7fgwQguBh5Psqca

     

       41
       41
       +
       CjBLBAFrQNOo1b/d27r95nHDoBx5CWfppzL75/Od+4825lkhuzB4h1Pb1e2r+yC3

     

       42
       42
       +
       54UWEydh1c43leYC+LdY/w1yrzQCgj+yc6A8W0nuvuDhnxmj8iyLdsL752s/p/aE

     

       43
       43
       +
       3P7KRAUuZ7eMSLJ86YkH9g8KgSHMKkCawVJG2lxqauI6iNo0kqtG8mOPzZfiwsMj

     

       44
       44
       +
       jl4ors27bSz9+4MYwkicyjWvA4r3wcco7MI6MHF5x+KLKbRWyqXddN1pTM1jncVe

     

       45
       45
       +
       BWNDauEDn/QeYuedxmsoW5Up/0gL9v6Zn+Nx2KAMsoHFxRzXxqEnUE+0Zlc+fbE1

     

       46
       46
       +
       b08CggEBAMiZmWtRmfueu9NMh6mgs+cmMA1ZHmbnIbtFpVjc37lrKUcjLzGF3tmp

     

       47
       47
       +
       zQl2wy8IcHpNv8F9aKhwAInxD49RUjyqvRD6Pru+EWN6gOPJIUVuZ6mvaf7BOxbn

     

       48
       48
       +
       Rve63hN5k4znQ1MOqGRiUkBxYSJ5wnFyQP0/8Y6+JM5uAuRUcKVNyoGURpfMrmB3

     

       49
       49
       +
       r+KHWltM9/5iIfiDNhwStFiuOJj1YBJVzrcAn8Zh5Q0+s1hXoOUs4doLcaPHTCTU

     

       50
       50
       +
       3hyX78yROMcZto0pVzxgQrYz31yQ5ocy9WcOYbPbQ5gdlnBEv8d7umNY1siz2wkI

     

       51
       51
       +
       NaEkKVO0D0jFtk37s/YqJpCsXg/B7yc=

     

       52
       52
       +
       -----END PRIVATE KEY-----

+36

pkgs/development/python-modules/flask-talisman/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , flask

     

       5
       5
       +
       , six

     

       6
       6
       +
       , pytestCheckHook

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       buildPythonPackage rec {

     

       10
       10
       +
         pname = "flask-talisman";

     

       11
       11
       +
         version = "0.8.1";

     

       12
       12
       +
       

     

       13
       13
       +
         src = fetchPypi {

     

       14
       14
       +
           inherit pname version;

     

       15
       15
       +
           sha256 = "11gjgqkpj2yqydb0pfhjyx56iy4l9szgz33vg5d7bw8vqp02wl2x";

     

       16
       16
       +
         };

     

       17
       17
       +
       

     

       18
       18
       +
         buildInputs = [

     

       19
       19
       +
           flask

     

       20
       20
       +
         ];

     

       21
       21
       +
       

     

       22
       22
       +
         propagatedBuildInputs = [

     

       23
       23
       +
           six

     

       24
       24
       +
         ];

     

       25
       25
       +
       

     

       26
       26
       +
         nativeBuildInputs = [

     

       27
       27
       +
           pytestCheckHook

     

       28
       28
       +
         ];

     

       29
       29
       +
       

     

       30
       30
       +
         meta = with lib; {

     

       31
       31
       +
           description = "HTTP security headers for Flask";

     

       32
       32
       +
           homepage = "https://github.com/wntrblm/flask-talisman";

     

       33
       33
       +
           license = licenses.asl20;

     

       34
       34
       +
           maintainers = [ lib.maintainers.symphorien ];

     

       35
       35
       +
         };

     

       36
       36
       +
       }

+13 -44

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

···

       1
       1
        
       { buildPythonPackage

     

       2
       2
        
       , lib

     

       3
       3
       -
       , fetchFromGitHub

     

       4
       3
        
       , isPy27

     

       5
       4
        
       , nixosTests

     

       6
       6
       -
       , fetchpatch

     

       7
       5
        
       , fetchPypi

     

       8
       6
        
       , alembic

     

       9
       7
        
       , aniso8601

     

       10
       8
        
       , Babel

     

       11
       9
        
       , blinker

     

       10
       10
       +
       , cachetools

     

       12
       11
        
       , click

     

       13
       12
        
       , dnspython

     

       14
       13
        
       , email_validator

     
···

       19
       18
        
       , flask_migrate

     

       20
       19
        
       , flask-restful

     

       21
       20
        
       , flask_sqlalchemy

     

       21
       21
       +
       , flask-talisman

     

       22
       22
        
       , flask_wtf

     

       23
       23
        
       , debts

     

       24
       24
        
       , idna

     
···

       28
       28
        
       , markupsafe

     

       29
       29
        
       , python-dateutil

     

       30
       30
        
       , pytz

     

       31
       31
       +
       , requests

     

       31
       32
        
       , six

     

       32
       33
        
       , sqlalchemy

     

       33
       34
        
       , sqlalchemy-utils

     
···

       43
       44
        
       # ihatemoney is not really a library. It will only ever be imported

     

       44
       45
        
       # by the interpreter of uwsgi. So overrides for its depencies are fine.

     

       45
       46
        
       let

     

       46
       46
       -
         # fixed in next release, but patches don't apply

     

       47
       47
       -
         # https://github.com/spiral-project/ihatemoney/issues/567

     

       48
       48
       -
         pinned_wtforms = wtforms.overridePythonAttrs (old: rec {

     

       49
       49
       -
           pname = "WTForms";

     

       50
       50
       -
           version = "2.2.1";

     

       51
       51
       -
           src = fetchPypi {

     

       52
       52
       -
             inherit pname version;

     

       53
       53
       -
             sha256 = "0q9vkcq6jnnn618h27lx9sas6s9qlg2mv8ja6dn0hy38gwzarnqc";

     

       54
       54
       -
           };

     

       55
       55
       -
         });

     

       56
       56
       -
       

     

       57
       47
        
         # sqlalchemy-continuum requires sqlalchemy < 1.4

     

       58
       48
        
         pinned_sqlalchemy = sqlalchemy.overridePythonAttrs (

     

       59
       49
        
           old: rec {

     
···

       70
       60
        
       

     

       71
       61
        
       buildPythonPackage rec {

     

       72
       62
        
         pname = "ihatemoney";

     

       73
       73
       -
         version = "4.2";

     

       63
       63
       +
         version = "5.1.1";

     

       74
       64
        
       

     

       75
       75
       -
         src = fetchFromGitHub {

     

       76
       76
       -
           owner = "spiral-project";

     

       77
       77
       -
           repo = pname;

     

       78
       78
       -
           rev = version;

     

       79
       79
       -
           sha256 = "0d4vc6m0jkwlz9ly0hcjghccydvqbldh2jb8yzf94jrgkd5fd7k1";

     

       65
       65
       +
         src = fetchPypi {

     

       66
       66
       +
           inherit pname version;

     

       67
       67
       +
           sha256 = "0gsqba9qbs1dpmfys8qpiahy4pbn4khcc6mgmdnhssmkjsb94sx6";

     

       80
       68
        
         };

     

       81
       69
        
       

     

       82
       70
        
         disabled = isPy27;

     

       83
       71
        
       

     

       84
       84
       -
         patches = [

     

       85
       85
       -
           # fix migration on postgresql

     

       86
       86
       -
           # remove on next release

     

       87
       87
       -
           (fetchpatch {

     

       88
       88
       -
             url = "https://github.com/spiral-project/ihatemoney/commit/6129191b26784b895e203fa3eafb89cee7d88b71.patch";

     

       89
       89
       -
             sha256 = "0yc24gsih9x3pnh2mhj4v5i71x02dq93a9jd2r8b1limhcl4p1sw";

     

       90
       90
       -
           })

     

       91
       91
       -
           (fetchpatch {

     

       92
       92
       -
             name = "CVE-2020-15120.patch";

     

       93
       93
       -
             url = "https://github.com/spiral-project/ihatemoney/commit/8d77cf5d5646e1d2d8ded13f0660638f57e98471.patch";

     

       94
       94
       -
             sha256 = "0y855sk3qsbpq7slj876k2ifa1lccc2dccag98pkyaadpz5gbabv";

     

       95
       95
       -
           })

     

       96
       96
       -
           # backported from current master

     

       97
       97
       -
           # remove dependency on flask-script, which removed support on some features ihm used to need

     

       98
       98
       -
           ./remove_flask_script.patch

     

       99
       99
       -
         ];

     

       100
       100
       -
       

     

       101
       101
       -
         postPatch = ''

     

       102
       102
       -
           # remove draconian pinning

     

       103
       103
       -
           sed -i 's/==.*$//' setup.cfg

     

       104
       104
       -
         '';

     

       105
       105
       -
       

     

       106
       72
        
         propagatedBuildInputs = [

     

       107
       73
        
           aniso8601

     

       108
       74
        
           Babel

     

       109
       75
        
           blinker

     

       76
       76
       +
           cachetools

     

       110
       77
        
           click

     

       111
       78
        
           dnspython

     

       112
       79
        
           email_validator

     
···

       125
       92
        
             }

     

       126
       93
        
           )

     

       127
       94
        
           flask-restful

     

       128
       128
       -
           (flask_wtf.override { wtforms = pinned_wtforms; })

     

       95
       95
       +
           flask-talisman

     

       96
       96
       +
           flask_wtf

     

       129
       97
        
           idna

     

       130
       98
        
           itsdangerous

     

       131
       99
        
           jinja2

     
···

       133
       101
        
           markupsafe

     

       134
       102
        
           python-dateutil

     

       135
       103
        
           pytz

     

       104
       104
       +
           requests

     

       136
       105
        
           six

     

       137
       106
        
           (

     

       138
       107
        
             (

     
···

       158
       127
        
             )

     

       159
       128
        
           )

     

       160
       129
        
           werkzeug

     

       161
       161
       -
           pinned_wtforms

     

       130
       130
       +
           wtforms

     

       162
       131
        
           psycopg2

     

       163
       132
        
           debts

     

       164
       133
        
         ];

     
···

       168
       137
        
           pytestCheckHook

     

       169
       138
        
         ];

     

       170
       139
        
       

     

       171
       171
       -
         pytestFlagsArray = [ "--pyargs ihatemoney.tests.tests" ];

     

       172
       140
        
         disabledTests = [

     

       173
       141
        
           "test_notifications"  # requires running service.

     

       174
       142
        
           "test_invite"         # requires running service.

     

       143
       143
       +
           "test_invitation_email_failure" # requires dns resolution

     

       175
       144
        
         ];

     

       176
       145
        
       

     

       177
       146
        
         passthru.tests = {

-284

pkgs/development/python-modules/ihatemoney/remove_flask_script.patch

···

       1
       1
       -
       commit 4d831ba2316d54f4916fb9d1160ec7a3856b47d4

     

       2
       2
       -
       Author: Glandos <bugs-github@antipoul.fr>

     

       3
       3
       -
       Date:   Sun Jun 6 14:30:52 2021 +0200

     

       4
       4
       -
       

     

       5
       5
       -
           remove usage of Flask-Script

     

       6
       6
       -
           

     

       7
       7
       -
           Use flask.cli instead with compatibility layer for existing commands,

     

       8
       8
       -
           such as "runserver".

     

       9
       9
       -
           

     

       10
       10
       -
           cherry-pick from 74e222f1a1cbfc2fac102fefc1115e9d0a6586dc

     

       11
       11
       -
       

     

       12
       12
       -
       diff --git a/Makefile b/Makefile

     

       13
       13
       -
       index a681709..90ab1bb 100644

     

       14
       14
       -
       --- a/Makefile

     

       15
       15
       -
       +++ b/Makefile

     

       16
       16
       -
       @@ -38,7 +38,7 @@ update: remove-install-stamp install ## Update the dependencies

     

       17
       17
       -
        .PHONY: serve

     

       18
       18
       -
        serve: install ## Run the ihatemoney server

     

       19
       19
       -
        	@echo 'Running ihatemoney on http://localhost:5000'

     

       20
       20
       -
       -	$(PYTHON) -m ihatemoney.manage runserver

     

       21
       21
       -
       +	$(PYTHON) -m ihatemoney.manage run

     

       22
       22
       -
        

     

       23
       23
       -
        .PHONY: test

     

       24
       24
       -
        test: install-dev ## Run the tests

     

       25
       25
       -
       diff --git a/docs/installation.rst b/docs/installation.rst

     

       26
       26
       -
       index 4994499..4df70a2 100644

     

       27
       27
       -
       --- a/docs/installation.rst

     

       28
       28
       -
       +++ b/docs/installation.rst

     

       29
       29
       -
       @@ -59,7 +59,7 @@ Test it

     

       30
       30
       -
        

     

       31
       31
       -
        Once installed, you can start a test server::

     

       32
       32
       -
        

     

       33
       33
       -
       -  ihatemoney runserver

     

       34
       34
       -
       +  ihatemoney run

     

       35
       35
       -
        

     

       36
       36
       -
        And point your browser at `http://localhost:5000 <http://localhost:5000>`_.

     

       37
       37
       -
        

     

       38
       38
       -
       diff --git a/ihatemoney/manage.py b/ihatemoney/manage.py

     

       39
       39
       -
       index a192844..805a07f 100755

     

       40
       40
       -
       --- a/ihatemoney/manage.py

     

       41
       41
       -
       +++ b/ihatemoney/manage.py

     

       42
       42
       -
       @@ -5,8 +5,8 @@ import os

     

       43
       43
       -
        import random

     

       44
       44
       -
        import sys

     

       45
       45
       -
        

     

       46
       46
       -
       -from flask_migrate import Migrate, MigrateCommand

     

       47
       47
       -
       -from flask_script import Command, Manager, Option

     

       48
       48
       -
       +import click

     

       49
       49
       -
       +from flask.cli import FlaskGroup

     

       50
       50
       -
        from werkzeug.security import generate_password_hash

     

       51
       51
       -
        

     

       52
       52
       -
        from ihatemoney.models import Project, db

     

       53
       53
       -
       @@ -14,31 +14,48 @@ from ihatemoney.run import create_app

     

       54
       54
       -
        from ihatemoney.utils import create_jinja_env

     

       55
       55
       -
        

     

       56
       56
       -
        

     

       57
       57
       -
       -class GeneratePasswordHash(Command):

     

       58
       58
       -
       +@click.group(cls=FlaskGroup, create_app=create_app)

     

       59
       59
       -
       +def cli():

     

       60
       60
       -
       +    """IHateMoney Management script"""

     

       61
       61
       -
        

     

       62
       62
       -
       -    """Get password from user and hash it without printing it in clear text."""

     

       63
       63
       -
        

     

       64
       64
       -
       -    def run(self):

     

       65
       65
       -
       -        password = getpass.getpass(prompt="Password: ")

     

       66
       66
       -
       -        print(generate_password_hash(password))

     

       67
       67
       -
       -

     

       68
       68
       -
       -

     

       69
       69
       -
       -class GenerateConfig(Command):

     

       70
       70
       -
       -    def get_options(self):

     

       71
       71
       -
       -        return [

     

       72
       72
       -
       -            Option(

     

       73
       73
       -
       -                "config_file",

     

       74
       74
       -
       -                choices=[

     

       75
       75
       -
       -                    "ihatemoney.cfg",

     

       76
       76
       -
       -                    "apache-vhost.conf",

     

       77
       77
       -
       -                    "gunicorn.conf.py",

     

       78
       78
       -
       -                    "supervisord.conf",

     

       79
       79
       -
       -                    "nginx.conf",

     

       80
       80
       -
       -                ],

     

       81
       81
       -
       -            )

     

       82
       82
       -
       +@cli.command(

     

       83
       83
       -
       +    context_settings={"ignore_unknown_options": True, "allow_extra_args": True}

     

       84
       84
       -
       +)

     

       85
       85
       -
       +@click.pass_context

     

       86
       86
       -
       +def runserver(ctx):

     

       87
       87
       -
       +    """Deprecated, use the "run" command instead"""

     

       88
       88
       -
       +    click.secho(

     

       89
       89
       -
       +        '"runserver" is deprecated, please use the standard "run" flask command',

     

       90
       90
       -
       +        fg="red",

     

       91
       91
       -
       +    )

     

       92
       92
       -
       +    run = cli.get_command(ctx, "run")

     

       93
       93
       -
       +    ctx.forward(run)

     

       94
       94
       -
       +

     

       95
       95
       -
       +

     

       96
       96
       -
       +@click.command(name="generate_password_hash")

     

       97
       97
       -
       +def password_hash():

     

       98
       98
       -
       +    """Get password from user and hash it without printing it in clear text."""

     

       99
       99
       -
       +    password = getpass.getpass(prompt="Password: ")

     

       100
       100
       -
       +    print(generate_password_hash(password))

     

       101
       101
       -
       +

     

       102
       102
       -
       +

     

       103
       103
       -
       +@click.command()

     

       104
       104
       -
       +@click.argument(

     

       105
       105
       -
       +    "config_file",

     

       106
       106
       -
       +    type=click.Choice(

     

       107
       107
       -
       +        [

     

       108
       108
       -
       +            "ihatemoney.cfg",

     

       109
       109
       -
       +            "apache-vhost.conf",

     

       110
       110
       -
       +            "gunicorn.conf.py",

     

       111
       111
       -
       +            "supervisord.conf",

     

       112
       112
       -
       +            "nginx.conf",

     

       113
       113
       -
                ]

     

       114
       114
       -
       +    ),

     

       115
       115
       -
       +)

     

       116
       116
       -
       +def generate_config(config_file):

     

       117
       117
       -
       +    """Generate front-end server configuration"""

     

       118
       118
       -
        

     

       119
       119
       -
       -    @staticmethod

     

       120
       120
       -
            def gen_secret_key():

     

       121
       121
       -
                return "".join(

     

       122
       122
       -
                    [

     

       123
       123
       -
       @@ -49,59 +66,33 @@ class GenerateConfig(Command):

     

       124
       124
       -
                    ]

     

       125
       125
       -
                )

     

       126
       126
       -
        

     

       127
       127
       -
       -    def run(self, config_file):

     

       128
       128
       -
       -        env = create_jinja_env("conf-templates", strict_rendering=True)

     

       129
       129
       -
       -        template = env.get_template("%s.j2" % config_file)

     

       130
       130
       -
       +    env = create_jinja_env("conf-templates", strict_rendering=True)

     

       131
       131
       -
       +    template = env.get_template(f"{config_file}.j2")

     

       132
       132
       -
        

     

       133
       133
       -
       -        bin_path = os.path.dirname(sys.executable)

     

       134
       134
       -
       -        pkg_path = os.path.abspath(os.path.dirname(__file__))

     

       135
       135
       -
       +    bin_path = os.path.dirname(sys.executable)

     

       136
       136
       -
       +    pkg_path = os.path.abspath(os.path.dirname(__file__))

     

       137
       137
       -
        

     

       138
       138
       -
       -        print(

     

       139
       139
       -
       -            template.render(

     

       140
       140
       -
       -                pkg_path=pkg_path,

     

       141
       141
       -
       -                bin_path=bin_path,

     

       142
       142
       -
       -                sys_prefix=sys.prefix,

     

       143
       143
       -
       -                secret_key=self.gen_secret_key(),

     

       144
       144
       -
       -            )

     

       145
       145
       -
       +    print(

     

       146
       146
       -
       +        template.render(

     

       147
       147
       -
       +            pkg_path=pkg_path,

     

       148
       148
       -
       +            bin_path=bin_path,

     

       149
       149
       -
       +            sys_prefix=sys.prefix,

     

       150
       150
       -
       +            secret_key=gen_secret_key(),

     

       151
       151
       -
                )

     

       152
       152
       -
       -

     

       153
       153
       -
       -

     

       154
       154
       -
       -class DeleteProject(Command):

     

       155
       155
       -
       -    def run(self, project_name):

     

       156
       156
       -
       -        demo_project = Project.query.get(project_name)

     

       157
       157
       -
       -        db.session.delete(demo_project)

     

       158
       158
       -
       +    )

     

       159
       159
       -
       +

     

       160
       160
       -
       +

     

       161
       161
       -
       +@cli.command()

     

       162
       162
       -
       +@click.argument("project_name")

     

       163
       163
       -
       +def delete_project(project_name):

     

       164
       164
       -
       +    """Delete a project"""

     

       165
       165
       -
       +    project = Project.query.get(project_name)

     

       166
       166
       -
       +    if project is None:

     

       167
       167
       -
       +        click.secho(f'Project "{project_name}" not found', fg="red")

     

       168
       168
       -
       +    else:

     

       169
       169
       -
       +        db.session.delete(project)

     

       170
       170
       -
                db.session.commit()

     

       171
       171
       -
        

     

       172
       172
       -
        

     

       173
       173
       -
       -def main():

     

       174
       174
       -
       -    QUIET_COMMANDS = ("generate_password_hash", "generate-config")

     

       175
       175
       -
       -

     

       176
       176
       -
       -    exception = None

     

       177
       177
       -
       -    backup_stderr = sys.stderr

     

       178
       178
       -
       -    # Hack to divert stderr for commands generating content to stdout

     

       179
       179
       -
       -    # to avoid confusing the user

     

       180
       180
       -
       -    if len(sys.argv) > 1 and sys.argv[1] in QUIET_COMMANDS:

     

       181
       181
       -
       -        sys.stderr = open(os.devnull, "w")

     

       182
       182
       -
       -

     

       183
       183
       -
       -    try:

     

       184
       184
       -
       -        app = create_app()

     

       185
       185
       -
       -        Migrate(app, db)

     

       186
       186
       -
       -    except Exception as e:

     

       187
       187
       -
       -        exception = e

     

       188
       188
       -
       -

     

       189
       189
       -
       -    # Restore stderr

     

       190
       190
       -
       -    sys.stderr = backup_stderr

     

       191
       191
       -
       -

     

       192
       192
       -
       -    if exception:

     

       193
       193
       -
       -        raise exception

     

       194
       194
       -
       -

     

       195
       195
       -
       -    manager = Manager(app)

     

       196
       196
       -
       -    manager.add_command("db", MigrateCommand)

     

       197
       197
       -
       -    manager.add_command("generate_password_hash", GeneratePasswordHash)

     

       198
       198
       -
       -    manager.add_command("generate-config", GenerateConfig)

     

       199
       199
       -
       -    manager.add_command("delete-project", DeleteProject)

     

       200
       200
       -
       -    manager.run()

     

       201
       201
       -
       -

     

       202
       202
       -
       -

     

       203
       203
       -
        if __name__ == "__main__":

     

       204
       204
       -
       -    main()

     

       205
       205
       -
       +    cli()

     

       206
       206
       -
       diff --git a/ihatemoney/tests/tests.py b/ihatemoney/tests/tests.py

     

       207
       207
       -
       index b27fafc..23f19a6 100644

     

       208
       208
       -
       --- a/ihatemoney/tests/tests.py

     

       209
       209
       -
       +++ b/ihatemoney/tests/tests.py

     

       210
       210
       -
       @@ -15,7 +15,7 @@ from sqlalchemy import orm

     

       211
       211
       -
        from werkzeug.security import check_password_hash, generate_password_hash

     

       212
       212
       -
        

     

       213
       213
       -
        from ihatemoney import history, models, utils

     

       214
       214
       -
       -from ihatemoney.manage import DeleteProject, GenerateConfig, GeneratePasswordHash

     

       215
       215
       -
       +from ihatemoney.manage import delete_project, generate_config, password_hash

     

       216
       216
       -
        from ihatemoney.run import create_app, db, load_configuration

     

       217
       217
       -
        from ihatemoney.versioning import LoggingMode

     

       218
       218
       -
        

     

       219
       219
       -
       @@ -2157,28 +2157,24 @@ class CommandTestCase(BaseTestCase):

     

       220
       220
       -
                - raise no exception

     

       221
       221
       -
                - produce something non-empty

     

       222
       222
       -
                """

     

       223
       223
       -
       -        cmd = GenerateConfig()

     

       224
       224
       -
       -        for config_file in cmd.get_options()[0].kwargs["choices"]:

     

       225
       225
       -
       -            with patch("sys.stdout", new=io.StringIO()) as stdout:

     

       226
       226
       -
       -                cmd.run(config_file)

     

       227
       227
       -
       -                print(stdout.getvalue())

     

       228
       228
       -
       -                self.assertNotEqual(len(stdout.getvalue().strip()), 0)

     

       229
       229
       -
       +        runner = self.app.test_cli_runner()

     

       230
       230
       -
       +        for config_file in generate_config.params[0].type.choices:

     

       231
       231
       -
       +            result = runner.invoke(generate_config, config_file)

     

       232
       232
       -
       +            self.assertNotEqual(len(result.output.strip()), 0)

     

       233
       233
       -
        

     

       234
       234
       -
            def test_generate_password_hash(self):

     

       235
       235
       -
       -        cmd = GeneratePasswordHash()

     

       236
       236
       -
       -        with patch("sys.stdout", new=io.StringIO()) as stdout, patch(

     

       237
       237
       -
       -            "getpass.getpass", new=lambda prompt: "secret"

     

       238
       238
       -
       -        ):  # NOQA

     

       239
       239
       -
       -            cmd.run()

     

       240
       240
       -
       -            print(stdout.getvalue())

     

       241
       241
       -
       -            self.assertEqual(len(stdout.getvalue().strip()), 189)

     

       242
       242
       -
       +        runner = self.app.test_cli_runner()

     

       243
       243
       -
       +        with patch("getpass.getpass", new=lambda prompt: "secret"):

     

       244
       244
       -
       +            result = runner.invoke(password_hash)

     

       245
       245
       -
       +            print(result.output.strip())

     

       246
       246
       -
       +            self.assertEqual(len(result.output.strip()), 102)

     

       247
       247
       -
        

     

       248
       248
       -
            def test_demo_project_deletion(self):

     

       249
       249
       -
                self.create_project("demo")

     

       250
       250
       -
                self.assertEquals(models.Project.query.get("demo").name, "demo")

     

       251
       251
       -
        

     

       252
       252
       -
       -        cmd = DeleteProject()

     

       253
       253
       -
       -        cmd.run("demo")

     

       254
       254
       -
       +        runner = self.app.test_cli_runner()

     

       255
       255
       -
       +        runner.invoke(delete_project, "demo")

     

       256
       256
       -
        

     

       257
       257
       -
                self.assertEqual(len(models.Project.query.all()), 0)

     

       258
       258
       -
        

     

       259
       259
       -
       diff --git a/setup.cfg b/setup.cfg

     

       260
       260
       -
       index d493717..48e447c 100644

     

       261
       261
       -
       --- a/setup.cfg

     

       262
       262
       -
       +++ b/setup.cfg

     

       263
       263
       -
       @@ -31,7 +31,6 @@ install_requires =

     

       264
       264
       -
            Flask-Mail==0.9.1

     

       265
       265
       -
            Flask-Migrate==2.5.3

     

       266
       266
       -
            Flask-RESTful==0.3.8

     

       267
       267
       -
       -    Flask-Script==2.0.6

     

       268
       268
       -
            Flask-SQLAlchemy==2.4.1

     

       269
       269
       -
            Flask-WTF==0.14.3

     

       270
       270
       -
        	WTForms==2.2.1

     

       271
       271
       -
       @@ -51,8 +50,12 @@ dev =

     

       272
       272
       -
            zest.releaser==6.20.1

     

       273
       273
       -
        

     

       274
       274
       -
        [options.entry_points]

     

       275
       275
       -
       +flask.commands =

     

       276
       276
       -
       +    generate_password_hash = ihatemoney.manage:password_hash

     

       277
       277
       -
       +    generate-config = ihatemoney.manage:generate_config

     

       278
       278
       -
       +

     

       279
       279
       -
        console_scripts =

     

       280
       280
       -
       -    ihatemoney = ihatemoney.manage:main

     

       281
       281
       -
       +    ihatemoney = ihatemoney.manage:cli

     

       282
       282
       -
        

     

       283
       283
       -
        paste.app_factory =

     

       284
       284
       -
            main = ihatemoney.run:main

pkgs/top-level/python-packages.nix

···

       2791
       2791
        
       

     

       2792
       2792
        
         flask-swagger-ui = callPackage ../development/python-modules/flask-swagger-ui { };

     

       2793
       2793
        
       

     

       2794
       2794
       +
         flask-talisman = callPackage ../development/python-modules/flask-talisman { };

     

       2795
       2795
       +
       

     

       2794
       2796
        
         flask_testing = callPackage ../development/python-modules/flask-testing { };

     

       2795
       2797
        
       

     

       2796
       2798
        
         flask-versioned = callPackage ../development/python-modules/flask-versioned { };