inst_access 0.1.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12fea04283e0ab7de90ccba958ea4b9493609a13ee76348f82cd7ba3d7130c05
-  data.tar.gz: aa5acc71501312bd6e2a565e54f34165a52452834afe0f9839a2042468edac69
+  metadata.gz: f3f8f9627e9866878600ebfffa114229879693c401e03a07f024c9ecc7aa4567
+  data.tar.gz: 95a2ad12a7fbb4392c6828353734ad24a43cb10056c822b50d6234c4f8f2223d
 SHA512:
-  metadata.gz: 7ec774b0de8614005a076ebb1446276ddc207d58f709d74acefa9edbffb5bcf17454e4be6e13e41e8cc1f227bae5e5c646d30aec67ca20f89d936f6fdf2086c5
-  data.tar.gz: c50c9bf65142c3e72b10eefb55cd658ccfac651f64e98dbb8c4103f301a4edf3effdedfcac5cdb74009274e282186179b9be30d6e416a08978a670a7444d66db
+  metadata.gz: 1946b0ac1c71312c08d2e931f542e3e35119d3e26b4590c03f260bfec093d947cae388125e935ab03d1e63cbb2c06273ed9ed7da67bfba54406d523b78142988
+  data.tar.gz: 650914d4e10bc474b71146351956ce903b318efb32c453da9ea697c3aac5cf0f840d2e455982f1abc6fa3ebf893857fef3db1fc990a8febd278e1b768034bab9

data/lib/inst_access/token.rb

@@ -54,6 +54,18 @@ module InstAccess
       jwt_payload[:region]
     end
 
+    def client_id
+      jwt_payload[:client_id]
+    end
+
+    def instructure_service?
+      jwt_payload[:instructure_service] == true
+    end
+
+    def jti
+      jwt_payload[:jti]
+    end
+
     def to_token_string
       jwe = to_jws.encrypt(InstAccess.config.encryption_key, ENCRYPTION_ALGO, ENCRYPTION_METHOD)
       jwe.to_s
@@ -87,7 +99,9 @@ module InstAccess
         real_user_shard_id: nil,
         user_global_id: nil,
         real_user_global_id: nil,
-        region: nil
+        region: nil,
+        client_id: nil,
+        instructure_service: nil
       )
         raise ArgumentError, 'Must provide user uuid and account uuid' if user_uuid.blank? || account_uuid.blank?
 
@@ -95,6 +109,7 @@ module InstAccess
 
         payload = {
           iss: ISSUER,
+          jti: SecureRandom.uuid,
           iat: now,
           exp: now + 1.hour.to_i,
           sub: user_uuid,
@@ -104,7 +119,9 @@ module InstAccess
           masq_shard: real_user_shard_id,
           debug_user_global_id: user_global_id&.to_s,
           debug_masq_global_id: real_user_global_id&.to_s,
-          region: region
+          region: region,
+          client_id: client_id,
+          instructure_service: instructure_service
         }.compact
 
         new(payload)

data/lib/inst_access/version.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+#
+# Copyright (C) 2023 - present Instructure, Inc.
+#
+# This file is part of Canvas.
+#
+# Canvas is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the Free
+# Software Foundation, version 3 of the License.
+#
+# Canvas is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Affero General Public License along
+# with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+
+module InstAccess
+  VERSION = '0.4.0'
+end

data/lib/inst_access.rb

@@ -23,6 +23,7 @@ require 'json/jwt'
 require 'inst_access/errors'
 require 'inst_access/config'
 require 'inst_access/token'
+require 'inst_access/version'
 
 module InstAccess
   class << self

data/spec/inst_access/token_spec.rb

@@ -85,12 +85,35 @@ describe InstAccess::Token do
         canvas_domain: 'z.instructure.com',
         real_user_uuid: 'masq-id',
         real_user_shard_id: 5,
-        region: 'us-west-2'
+        region: 'us-west-2',
+        client_id: 'client-id',
+        instructure_service: true
       )
       expect(id.canvas_domain).to eq('z.instructure.com')
       expect(id.masquerading_user_uuid).to eq('masq-id')
       expect(id.masquerading_user_shard_id).to eq(5)
       expect(id.region).to eq('us-west-2')
+      expect(id.client_id).to eq('client-id')
+      expect(id.instructure_service?).to eq true
+    end
+
+    it 'generates a unique jti' do
+      uuid = SecureRandom.uuid
+
+      allow(SecureRandom).to receive(:uuid).and_return uuid
+
+      id = described_class.for_user(
+        user_uuid: 'user-uuid',
+        account_uuid: 'acct-uuid',
+        canvas_domain: 'z.instructure.com',
+        real_user_uuid: 'masq-id',
+        real_user_shard_id: 5,
+        region: 'us-west-2',
+        client_id: 'client-id',
+        instructure_service: true
+      )
+
+      expect(id.jti).to eq uuid
     end
 
     it 'includes global id debug info if given' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inst_access
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Michael Ziwisky
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-19 00:00:00.000000000 Z
+date: 2023-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -28,16 +28,16 @@ dependencies:
   name: json-jwt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: 1.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: 1.13.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -150,7 +150,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
+description: 
 email:
 - mziwisky@instructure.com
 executables: []
@@ -161,6 +161,7 @@ files:
 - lib/inst_access/config.rb
 - lib/inst_access/errors.rb
 - lib/inst_access/token.rb
+- lib/inst_access/version.rb
 - spec/initialize_coverage.rb
 - spec/inst_access/inst_access_spec.rb
 - spec/inst_access/token_spec.rb
@@ -169,7 +170,7 @@ files:
 homepage: http://github.com/instructure/inst_access
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -184,8 +185,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 3.2.6
+signing_key: 
 specification_version: 4
 summary: Generation, parsing, and validation of Instructure access tokens
 test_files: