Skip to content
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
2 changes: 1 addition & 1 deletion keepercli-package/src/keepercli/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
# Contact: commander@keepersecurity.com
#

__version__ = '1.2.0'
__version__ = '1.2.1'

2 changes: 1 addition & 1 deletion keepersdk-package/src/keepersdk/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
#
from . import background

__version__ = '1.2.0'
__version__ = '1.2.1'

background.init()
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '1.2.0' # pragma: no cover
__version__ = '1.1.9' # pragma: no cover
2 changes: 1 addition & 1 deletion keepersdk-package/src/keepersdk/vault/nsf_common.py
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ def get_user_public_key(
raise ValueError(
f"Share invitation sent to '{recipient_email}'. "
f"Repeat after the invitation is accepted.")
raise ValueError(f"User {recipient_email} has no public key")
raise ValueError(f"User {recipient_email} has no public key or user not found")
if not recipient_uid_bytes:
recipient_uid_bytes = resolve_user_uid_bytes(vault, recipient_email)
if require_uid and not recipient_uid_bytes:
Expand Down
2 changes: 1 addition & 1 deletion keepersdk-package/src/keepersdk/vault/nsf_sharing.py
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ def grant_nsf_folder_access(
team_keys = vault.keeper_auth.get_team_keys(utils.base64_url_encode(uid_bytes))
if not team_keys:
raise NsfError(f'Team keys not available for {recipient}')
efk, key_type = nsf_common.encrypt_for_team(fk, team_keys, forbid_rsa=True)
efk, key_type = nsf_common.encrypt_for_team(fk, team_keys, forbid_rsa=vault.keeper_auth.auth_context.forbid_rsa)
ek = folder_pb2.EncryptedDataKey()
ek.encryptedKey = efk
ek.encryptedKeyType = key_type
Expand Down
3 changes: 2 additions & 1 deletion keepersdk-package/src/keepersdk/vault/sync_down.py
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,7 @@ def to_non_shared_data(nsd: SyncDown_pb2.NonSharedData) -> StorageNonSharedData:
sf_keys: List[StorageSharedFolderKey] = []

def to_team(sync_down_team: SyncDown_pb2.Team) -> Optional[StorageTeam]:
team_uid = utils.base64_url_encode(sync_down_team.teamUid)
try:
team_key = decrypt_keeper_key(auth.auth_context, sync_down_team.teamKey, sync_down_team.teamKeyType)

Expand Down Expand Up @@ -287,7 +288,7 @@ def to_team(sync_down_team: SyncDown_pb2.Team) -> Optional[StorageTeam]:
logger.error('Shared Folder %s key decrypt error: %s', sf_uid, e)

s_team = StorageTeam()
s_team.team_uid = utils.base64_url_encode(sync_down_team.teamUid)
s_team.team_uid = team_uid
s_team.name = sync_down_team.name
s_team.team_key = crypto.encrypt_aes_v2(team_key, auth.auth_context.client_key)
s_team.key_type = StorageKeyType.UserClientKey_AES_GCM
Expand Down
Loading