Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Z
ZKAPAuthorizer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Administrator
ZKAPAuthorizer
Commits
068a3d8c
Commit
068a3d8c
authored
5 years ago
by
Jean-Paul Calderone
Browse files
Options
Downloads
Patches
Plain Diff
Some logging about voucher redemption
parent
36dd4c2c
No related branches found
Branches containing commit
No related tags found
1 merge request
!31
Redeem from issuer
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/_zkapauthorizer/controller.py
+10
-0
10 additions, 0 deletions
src/_zkapauthorizer/controller.py
src/_zkapauthorizer/resource.py
+6
-0
6 additions, 0 deletions
src/_zkapauthorizer/resource.py
with
16 additions
and
0 deletions
src/_zkapauthorizer/controller.py
+
10
−
0
View file @
068a3d8c
...
...
@@ -30,6 +30,9 @@ from zope.interface import (
implementer
,
)
from
twisted.logger
import
(
Logger
,
)
from
twisted.python.url
import
(
URL
,
)
...
...
@@ -300,6 +303,8 @@ class PaymentController(object):
the voucher. The data store marks the voucher as redeemed and stores
the unblinded tokens for use by the storage client.
"""
_log
=
Logger
()
store
=
attr
.
ib
()
redeemer
=
attr
.
ib
()
...
...
@@ -316,16 +321,20 @@ class PaymentController(object):
# server signs a given set of random tokens once or many times, the
# number of passes that can be constructed is still only the size of
# the set of random tokens.
self
.
_log
.
info
(
"
Generating random tokens for a voucher ({voucher}).
"
,
voucher
=
voucher
)
tokens
=
self
.
redeemer
.
random_tokens_for_voucher
(
Voucher
(
voucher
),
100
)
# Persist the voucher and tokens so they're available if we fail.
self
.
_log
.
info
(
"
Persistenting random tokens for a voucher ({voucher}).
"
,
voucher
=
voucher
)
self
.
store
.
add
(
voucher
,
tokens
)
# Ask the redeemer to do the real task of redemption.
self
.
_log
.
info
(
"
Redeeming random tokens for a voucher ({voucher}).
"
,
voucher
=
voucher
)
d
=
self
.
redeemer
.
redeem
(
Voucher
(
voucher
),
tokens
)
d
.
addCallback
(
partial
(
self
.
_redeemSuccess
,
voucher
),
)
# XXX This needs an errback!
def
_redeemSuccess
(
self
,
voucher
,
unblinded_tokens
):
"""
...
...
@@ -333,6 +342,7 @@ class PaymentController(object):
store the resulting unblinded tokens (which can be used to construct
passes later).
"""
self
.
_log
.
info
(
"
Inserting redeemed unblinded tokens for a voucher ({voucher}).
"
,
voucher
=
voucher
)
self
.
store
.
insert_unblinded_tokens_for_voucher
(
voucher
,
unblinded_tokens
)
...
...
This diff is collapsed.
Click to expand it.
src/_zkapauthorizer/resource.py
+
6
−
0
View file @
068a3d8c
...
...
@@ -24,6 +24,9 @@ from json import (
loads
,
dumps
,
)
from
twisted.logger
import
(
Logger
,
)
from
twisted.web.http
import
(
BAD_REQUEST
,
)
...
...
@@ -84,6 +87,8 @@ class _VoucherCollection(Resource):
redemption controller. Child resources of this resource can also be
retrieved to monitor the status of previously submitted vouchers.
"""
_log
=
Logger
()
def
__init__
(
self
,
store
,
controller
):
self
.
_store
=
store
self
.
_controller
=
controller
...
...
@@ -104,6 +109,7 @@ class _VoucherCollection(Resource):
if
not
is_syntactic_voucher
(
voucher
):
return
bad_request
(
u
"
submitted voucher is syntactically invalid
"
).
render
(
request
)
self
.
_log
.
info
(
"
Accepting a voucher ({voucher}) for redemption.
"
,
voucher
=
voucher
)
self
.
_controller
.
redeem
(
voucher
)
return
b
""
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment