darrrr 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99023852b801750484da347fc36c9ef72f5b7b07
-  data.tar.gz: 0b8a7c03c3026c534335dc5eb0dd71655fa03bb9
+  metadata.gz: d14b89df09e2c495a699508b7b1c10e29f6d416c
+  data.tar.gz: d1cebf97f5b69c963e663eaaeeee8c5f54b2c4a3
 SHA512:
-  metadata.gz: 66937a871be05642722e9cdba99c989bbb109edc34c0d6b6ffdd0f8bc72a3c2fb18dd10a360beeb0fb8312f732073adc69cf8f4b786cb8c1e28df90c73773850
-  data.tar.gz: a5e4f66cdb06a0e95f83010b6eb0c4ead700b1e6ec7bc4652c8d429007017f473f0185746664817819573915cf1d8b20d7f5c77e80ba4a7a5d180c066fcb2118
+  metadata.gz: cf71fdd96d941b63711292e1f981f73b13da91b40c2a099ef626cf2ef9eceaafbdeb7972a114c6ada198a3998b7f0330f9e21893ef3f54767f28fca7047bb740
+  data.tar.gz: a3b111b878a06733ef88e58c1ed5c8c2161ffb6ffc265f80eb7af1c39711c74396b44b1a3182587db2b08692639b1aadbf9acc937765ce246d661c5a07cdcae0

data/lib/darrrr/account_provider.rb

@@ -53,10 +53,11 @@ module Darrrr
     # data: value to encrypt in the token
     # provider: the recovery provider/audience of the token
     # context: arbitrary data passed on to underlying crypto operations
+    # options: the value to set for the options byte
     #
     # returns a [RecoveryToken, b64 encoded sealed_token] tuple
-    def generate_recovery_token(data:, audience:, context: nil)
-      token = RecoveryToken.build(issuer: self, audience: audience, type: RECOVERY_TOKEN_TYPE)
+    def generate_recovery_token(data:, audience:, context: nil, options: 0x00)
+      token = RecoveryToken.build(issuer: self, audience: audience, type: RECOVERY_TOKEN_TYPE, options: options)
       token.data = self.encryptor.encrypt(data, self, context)
 
       [token, seal(token, context)]

data/lib/darrrr/recovery_provider.rb

@@ -66,10 +66,13 @@ module Darrrr
     # data structure is identical to the structure it's wrapping in format.
     #
     # token: the to_binary_s or binary representation of the recovery token
+    # context: an arbitrary object that is passed to lower level crypto operations
+    # options: the value to set in the options byte field of the recovery
+    #   token (defaults to 0x00)
     #
     # returns a Base64 encoded representation of the countersigned token
     # and the signature over the token.
-    def countersign_token(token, context = nil)
+    def countersign_token(token:, context: nil, options: 0x00)
       begin
         account_provider = RecoveryToken.account_provider_issuer(token)
       rescue RecoveryTokenSerializationError, UnknownProviderError
@@ -79,7 +82,8 @@ module Darrrr
       counter_recovery_token = RecoveryToken.build(
         issuer: self,
         audience: account_provider,
-        type: COUNTERSIGNED_RECOVERY_TOKEN_TYPE
+        type: COUNTERSIGNED_RECOVERY_TOKEN_TYPE,
+        options: options,
       )
 
       counter_recovery_token.data = token

data/lib/darrrr/recovery_token.rb

@@ -35,17 +35,17 @@ module Darrrr
 
     class << self
       # data: the value that will be encrypted by EncryptedData.
-      # recovery_provider: the provider for which we are building the token.
-      # binding_data: a value retrieved from the recovery provider for this
-      # token.
+      # audience: the provider for which we are building the token.
+      # type: Either 0 (recovery token) or 1 (countersigned recovery token)
+      # options: the value to set for the options byte
       #
       # returns a RecoveryToken.
-      def build(issuer:, audience:, type:)
+      def build(issuer:, audience:, type:, options: 0x00)
         token = RecoveryTokenWriter.new.tap do |token|
           token.token_id = token_id
           token.issuer = issuer.origin
           token.issued_time = Time.now.utc.iso8601
-          token.options = 0 # when the token-status endpoint is implemented, change this to 1
+          token.options = options
           token.audience = audience.origin
           token.version = Darrrr::PROTOCOL_VERSION
           token.token_type = type

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: darrrr
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Neil Matatall
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-04 00:00:00.000000000 Z
+date: 2017-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake