Skip to content
This repository was archived by the owner on Apr 17, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 2.7.0

* add get_jwks

## 2.6.4

* add create jwt function to get_jwt
Expand Down
18 changes: 18 additions & 0 deletions confidant_client/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -528,6 +528,24 @@ def get_jwt(self, environment, resource_id, expiry):
ret['result'] = True
return ret

def get_jwks(self, environment):
ret = {'result': False, 'keys': {}}
url = '{0}/v1/jwks/public/{1}'.format(self.config['url'], environment)

try:
response = self._execute_request(
'get',
url,
)
data = response.json()
ret['keys'] = data
except RequestExecutionError:
logging.exception('Error with executing request')
return ret

ret['result'] = True
return ret

def _decrypt_blind_credentials(self, blind_credentials):
_blind_credentials = []
for blind_credential in blind_credentials:
Expand Down
17 changes: 17 additions & 0 deletions confidant_client/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -606,6 +606,18 @@ def _parse_args():
default=None,
help='The expiry of the JWT in seconds',
)

get_jwks = subparsers.add_parser(
'get_jwks',
help='Retrieve a public JWKS for the requested environment',
)
get_jwks.add_argument(
'--environment',
type=str,
dest='environment',
required=True,
)

return parser.parse_args()


Expand Down Expand Up @@ -807,6 +819,11 @@ def main():
args.expiry)
except Exception:
logging.exception('An unexpected general error occurred.')
elif args.subcommand == 'get_jwks':
try:
ret = client.get_jwks(args.environment)
except Exception:
logging.exception('An unexpected general error occurred.')

print(json.dumps(ret, sort_keys=True, indent=4, separators=(',', ': ')))
if not ret['result']:
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

setup(
name="confidant-client",
version="2.6.4",
version="2.7.0",
packages=find_packages(exclude=["test*"]),
install_requires=[
# Boto3 is the Amazon Web Services (AWS) Software Development Kit (SDK)
Expand Down
24 changes: 24 additions & 0 deletions tests/unit/confidant_client/client_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -937,3 +937,27 @@ def test_get_jwt_creation(self):
timeout=5,
params={'environment': 'development'},
)

def test_get_jwks(self):
client = confidant_client.ConfidantClient(
'http://localhost',
'alias/authnz-testing',
{'from': 'confidant-unittest',
'to': 'test',
'user_type': 'service'},
)
token_mock = MagicMock()
client._get_token = token_mock
client.request_session.request = mock_200

self.assertEqual(
client.get_jwks('development'),
{'result': True, 'keys': {}}
)
client.request_session.request.assert_called_with(
'GET',
'http://localhost/v1/jwks/public/development',
auth=('2/service/confidant-unittest', token_mock()),
allow_redirects=False,
timeout=5,
)