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
4 changes: 3 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ RUN apt-get update && \
apt-get upgrade -y && \
apt-get install -y --no-install-recommends \
openssl \
ca-certificates && \
ca-certificates \
gcc \
libc6-dev && \
pip install --no-cache-dir --upgrade pip setuptools wheel && \
apt-get autoremove -y && \
apt-get clean && \
Expand Down
2 changes: 1 addition & 1 deletion keepercommander/commands/register.py
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ def prepare_request(params, kwargs, curr_sf, users, teams, rec_uids, *,
logging.warning('Share invitation has been sent to \'%s\'', username)
logging.warning('Please repeat this command when invitation is accepted.')
keys = params.key_cache.get(email)
if keys and keys.rsa or keys.ec:
if keys and (keys.rsa or keys.ec):
uo.manageRecords = curr_sf.get('default_manage_records') is True if mr is None else folder_pb2.BOOLEAN_TRUE if mr == 'on' else folder_pb2.BOOLEAN_FALSE
uo.manageUsers = curr_sf.get('default_manage_users') is True if mu is None else folder_pb2.BOOLEAN_TRUE if mu == 'on' else folder_pb2.BOOLEAN_FALSE
sf_key = curr_sf.get('shared_folder_key_unencrypted') # type: Optional[bytes]
Expand Down
1 change: 1 addition & 0 deletions keepercommander/rest_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ def execute_rest(context, endpoint, payload):
qrc_success = True
except Exception as e:
logging.warning(f"QRC encryption failed ({e}), falling back to EC encryption")
context.disable_qrc()

# Fallback to EC encryption if QRC not available or failed
if not qrc_success:
Expand Down