Merge pull request #46 from silinternational/develop

Release 2.1.0

Author: forevermatt

.whitesource

@@ -0,0 +1,8 @@
+{
+  "generalSettings": {
+    "shouldScanRepo": true
+  },
+  "checkRunSettings": {
+    "vulnerableCheckRunConclusionLevel": "failure"
+  }
+}

README.md

@@ -43,7 +43,7 @@ For details about the various API endpoints, see
   the user presses the button on the device.
 - Pressing the button will trigger the callback method provided to the `u2f.register()`
   call which should pass the response object to the consumer's service, which in turn
-  can make a `PUT` call to `/mfa/{uuid}` with a JSON body including a property named
+  can make a `PUT` call to `/u2f/{uuid}` with a JSON body including a property named
   `signResult` with a value of the object returned from the U2F device.
 - We will validate the response and store the `keyHandle` and `publicKey` encrypted by
   the consumer's API Secret and respond with a success or error message.
@@ -57,7 +57,7 @@ For details about the various API endpoints, see
   the user presses the button on the device.
 - Pressing the button will trigger the callback method provided to the `u2f.sign()`
   call which should pass the response object to the consumer's service, which in turn
-  can make a `PUT` call to `/mfa/{uuid}/auth` with a JSON body including a property named
+  can make a `PUT` call to `/u2f/{uuid}/auth` with a JSON body including a property named
   `signResult` with a value of the object returned from the U2F device.
 - We will validate the signResult and respond with a success or error message.
 

serverless.yml

@@ -6,7 +6,7 @@ provider:
   name: aws
   runtime: nodejs6.10
   timeout: 30
-  
+
   # Experimented with various memory sizes. Manually calling the totpValidate
   # function once every few seconds, the average durations were as follows:
   #   512 MB = 48 ms
@@ -16,7 +16,7 @@ provider:
   apiKeys:
     - ${self:custom.namespace}_global
   iamRoleStatements:
-    - Effect: "Allow"
+    - Effect: Allow
       Action:
         - dynamodb:DescribeTable
         - dynamodb:Query
@@ -25,7 +25,7 @@ provider:
         - dynamodb:PutItem
         - dynamodb:UpdateItem
         - dynamodb:DeleteItem
-      Resource: "arn:aws:dynamodb:us-east-1:*:*"
+      Resource: "arn:aws:dynamodb:${opt:region, self:provider.region}:*:table/${self:custom.namespace}_*"
 
 custom:
   stage: ${opt:stage, self:provider.stage}
@@ -143,53 +143,41 @@ functions:
 resources:
   Resources:
     ApiKeyDynamoDbTable:
-      Type: 'AWS::DynamoDB::Table'
+      Type: AWS::DynamoDB::Table
       DeletionPolicy: Retain
       Properties:
         AttributeDefinitions:
-          -
-            AttributeName: value
+          - AttributeName: value
             AttributeType: S
         KeySchema:
-          -
-            AttributeName: value
+          - AttributeName: value
             KeyType: HASH
-        ProvisionedThroughput:
-          ReadCapacityUnits: 5
-          WriteCapacityUnits: 5
-        TableName: '${self:custom.apiKeyTable}'
+        BillingMode: PAY_PER_REQUEST
+        TableName: ${self:custom.apiKeyTable}
     TotpDynamoDbTable:
-      Type: 'AWS::DynamoDB::Table'
+      Type: AWS::DynamoDB::Table
       DeletionPolicy: Retain
       Properties:
         AttributeDefinitions:
-          -
-            AttributeName: uuid
+          - AttributeName: uuid
             AttributeType: S
         KeySchema:
-          -
-            AttributeName: uuid
+          - AttributeName: uuid
             KeyType: HASH
-        ProvisionedThroughput:
-          ReadCapacityUnits: 5
-          WriteCapacityUnits: 5
-        TableName: '${self:custom.totpTable}'
+        BillingMode: PAY_PER_REQUEST
+        TableName: ${self:custom.totpTable}
     U2fDynamoDbTable:
-      Type: 'AWS::DynamoDB::Table'
+      Type: AWS::DynamoDB::Table
       DeletionPolicy: Retain
       Properties:
         AttributeDefinitions:
-          -
-            AttributeName: uuid
+          - AttributeName: uuid
             AttributeType: S
         KeySchema:
-          -
-            AttributeName: uuid
+          - AttributeName: uuid
             KeyType: HASH
-        ProvisionedThroughput:
-          ReadCapacityUnits: 5
-          WriteCapacityUnits: 5
-        TableName: '${self:custom.u2fTable}'
+        BillingMode: PAY_PER_REQUEST
+        TableName: ${self:custom.u2fTable}
     ApiKeyActivateLogGroup:
       Properties:
         RetentionInDays: "30"