diff --git a/default.nix b/default.nix index bf40653608df88e7c901bb2de015b82c2528191c..c0d3d7f5a4ec51f39fa0d64486e3051f5788d6dc 100644 --- a/default.nix +++ b/default.nix @@ -1,2 +1,2 @@ { pkgs ? import <nixpkgs> { overlays = [ (import ./overlays.nix) ]; } }: -pkgs.python27Packages.callPackage ./zcapauthorizer.nix { } +pkgs.python27Packages.callPackage ./zkapauthorizer.nix { } diff --git a/docs/source/interface.rst b/docs/source/interface.rst index 73c83bda0d5d634b385daf0760db8bd6653fe756..261127a9e8f27f4f086f32e14b6a3a5a43197429 100644 --- a/docs/source/interface.rst +++ b/docs/source/interface.rst @@ -7,8 +7,8 @@ Client When enabled in a Tahoe-LAFS client node, ZKAPAuthorizer publishes an HTTP-based interface inside the main Tahoe-LAFS web interface. -``PUT /storage-plugins/privatestorageio-satauthz-v1/voucher`` -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +``PUT /storage-plugins/privatestorageio-zkapauthz-v1/voucher`` +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ This endpoint allows an external agent which has submitted a payment to cause the plugin to redeem the voucher for tokens. The request body for this endpoint must have the ``application/json`` content-type. @@ -22,8 +22,8 @@ If the voucher cannot be accepted at the time of the request then the response c If the response is **OK** then a repeated request with the same body will have no effect. If the response is not **OK** then a repeated request with the same body will try to accept the number again. -``GET /storage-plugins/privatestorageio-satauthz-v1/voucher/<voucher>`` -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +``GET /storage-plugins/privatestorageio-zkapauthz-v1/voucher/<voucher>`` +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ This endpoint allows an external agent to monitor the status of the redemption of a voucher. This endpoint accepts no request body. @@ -37,8 +37,8 @@ the response is **OK** with an ``application/json`` content-type response body l The ``value`` property merely indicates the voucher which was requested. Further properties will be added to this response in the near future. -``GET /storage-plugins/privatestorageio-satauthz-v1/voucher`` -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +``GET /storage-plugins/privatestorageio-zkapauthz-v1/voucher`` +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ This endpoint allows an external agent to retrieve the status of all vouchers. This endpoint accepts no request body. diff --git a/shell.nix b/shell.nix index 5dcc7a8b4dc3eb06fef0a879f02209e866a65ae1..9831badbecba81acb54a50f95fe677e6ca9a57e6 100644 --- a/shell.nix +++ b/shell.nix @@ -1,6 +1,6 @@ { pkgs ? import <nixpkgs> { overlays = [ (import ./overlays.nix) ]; } }: let - satauthorizer = pkgs.callPackage ./default.nix { }; + zkapauthorizer = pkgs.callPackage ./default.nix { }; in (pkgs.python27.buildEnv.override { extraLibs = with pkgs.python27Packages; [ @@ -8,7 +8,7 @@ in testtools hypothesis pyhamcrest - satauthorizer + zkapauthorizer ]; ignoreCollisions = true; }).env diff --git a/src/_zkapauthorizer/_plugin.py b/src/_zkapauthorizer/_plugin.py index bd4cc37175f73121812c1cd82f795acc4e697ade..e83f3166663e3a9a9e849be57dbc77f458257d3c 100644 --- a/src/_zkapauthorizer/_plugin.py +++ b/src/_zkapauthorizer/_plugin.py @@ -59,7 +59,7 @@ class ZKAPAuthorizer(object): A storage plugin which provides a token-based access control mechanism on top of the Tahoe-LAFS built-in storage server interface. """ - name = u"privatestorageio-satauthz-v1" + name = u"privatestorageio-zkapauthz-v1" def get_storage_server(self, configuration, get_anonymous_storage_server): announcement = {} diff --git a/src/_zkapauthorizer/model.py b/src/_zkapauthorizer/model.py index 3027761be74ff61961e752071f6e8f8b293fdc02..58357cb237a36e9d1ac300529ccb0d9bdad0c03b 100644 --- a/src/_zkapauthorizer/model.py +++ b/src/_zkapauthorizer/model.py @@ -49,7 +49,7 @@ class SchemaError(TypeError): pass -CONFIG_DB_NAME = u"privatestorageio-satauthz-v1.sqlite3" +CONFIG_DB_NAME = u"privatestorageio-zkapauthz-v1.sqlite3" def open_and_initialize(path, required_schema_version, connect=None): """ diff --git a/src/_zkapauthorizer/resource.py b/src/_zkapauthorizer/resource.py index 97743a5bc35842ded2b4c3dcd1c05c38109189b0..e13b81b2260ded02c90aa496eab06158ef452f10 100644 --- a/src/_zkapauthorizer/resource.py +++ b/src/_zkapauthorizer/resource.py @@ -49,7 +49,7 @@ def from_configuration(node_config, store=None): Instantiate the plugin root resource using data from its configuration section in the Tahoe-LAFS configuration file:: - [storageclient.plugins.privatestorageio-satauthz-v1] + [storageclient.plugins.privatestorageio-zkapauthz-v1] # nothing yet :param _Config node_config: An object representing the overall node diff --git a/src/_zkapauthorizer/tests/test_client_resource.py b/src/_zkapauthorizer/tests/test_client_resource.py index 246223d636d20550ed82be44aaa885753efb839a..dad75bb63b094f71201f99a8dfdbf1cee3888b13 100644 --- a/src/_zkapauthorizer/tests/test_client_resource.py +++ b/src/_zkapauthorizer/tests/test_client_resource.py @@ -121,7 +121,7 @@ def uncooperator(started=True): tahoe_configs_with_client_config = tahoe_configs(storage_client_plugins={ - u"privatestorageio-satauthz-v1": client_configurations(), + u"privatestorageio-zkapauthz-v1": client_configurations(), }) def is_not_json(bytestring): diff --git a/secure-access-token-authorizer.nix b/zkapauthorizer.nix similarity index 100% rename from secure-access-token-authorizer.nix rename to zkapauthorizer.nix