mirror of
https://github.com/zotero/zotero.git
synced 2026-10-12 03:48:16 +00:00
55434d14a1
Wraps the values stored in nsILoginManager with OSKeyStore, which derives its master key from Keychain on macOS, DPAPI on Windows, and libsecret on Linux. A copy of the profile alone is no longer enough to extract these credentials. Existing plaintext entries are mirrored once per session to a new "(encrypted)" realm but preserved in the original realm so a user can still downgrade to a release that doesn't know about encryption. Active credential changes (sign in, sign out, password change) write to the encrypted realm only and remove the legacy entry. A future version can clear any remaining legacy entries on startup. Patches MOZ_APP_BASENAME in the bundled runtime so the keychain master key is labeled "Zotero Encrypted Storage" rather than "Firefox Encrypted Storage", with a check_line guard so a future Mozilla change to the OSKeyStore label format fails the build instead of silently rebranding the entry. Also fixes check_line to take an explicit file argument.
91 lines
1.7 KiB
Bash
91 lines
1.7 KiB
Bash
get_current_platform() {
|
|
if [[ "$OSTYPE" == "linux-gnu"* ]]; then
|
|
echo l
|
|
elif [[ "$OSTYPE" == "darwin"* ]]; then
|
|
echo m
|
|
elif [[ "$OSTYPE" == "cygwin" ]]; then
|
|
echo w
|
|
elif [[ "$OSTYPE" == "msys" ]]; then
|
|
echo w
|
|
# Unknown, so probably Unix-y
|
|
else
|
|
echo l
|
|
fi
|
|
}
|
|
|
|
get_canonical_arch() {
|
|
local _platform=$1
|
|
local _arch=$2
|
|
|
|
case $_platform in
|
|
w)
|
|
case $_arch in
|
|
x64) _arch="win-x64" ;;
|
|
arm64) _arch="win-arm64" ;;
|
|
win32|win-x64|win-arm64) ;;
|
|
*) echo "Invalid Windows archicture: $_arch" >&2;;
|
|
esac
|
|
echo $_arch
|
|
;;
|
|
|
|
l)
|
|
[[ $_arch == x64 ]] && _arch="x86_64"
|
|
echo $_arch
|
|
;;
|
|
|
|
*)
|
|
echo "Invalid platform '$platform'" 2>&1
|
|
exit 1
|
|
esac
|
|
}
|
|
|
|
function check_line {
|
|
pattern=$1
|
|
file=$2
|
|
if ! grep -E -q "$pattern" "$file"; then
|
|
echo "$pattern" not found in "$file" -- aborting 2>&1
|
|
exit 1
|
|
fi
|
|
}
|
|
|
|
function replace_line {
|
|
pattern=$1
|
|
replacement=$2
|
|
file=$3
|
|
|
|
if grep -E -q "$pattern" "$file"; then
|
|
perl -pi -e "s/$pattern/$replacement/" "$file"
|
|
else
|
|
echo "$pattern" not found in "$file" -- aborting 2>&1
|
|
exit 1
|
|
fi
|
|
}
|
|
|
|
function remove_line {
|
|
pattern=$1
|
|
file=$2
|
|
|
|
if grep -E -q "$pattern" "$file"; then
|
|
grep -E -v "$pattern" "$file" > "$file.tmp"
|
|
mv "$file.tmp" "$file"
|
|
else
|
|
echo "$pattern" not found in "$file" -- aborting 2>&1
|
|
exit 1
|
|
fi
|
|
}
|
|
|
|
function remove_between {
|
|
start_pattern=$1
|
|
end_pattern=$2
|
|
file=$3
|
|
|
|
if grep -E -q "$start_pattern" "$file" && grep -E -q "$end_pattern" "$file"; then
|
|
perl -ni -e '
|
|
if (/'"$start_pattern"'/) { $skip = 1; next; }
|
|
elsif ($skip && /'"$end_pattern"'/) { $skip = 0; next; }
|
|
print unless $skip;' "$file"
|
|
else
|
|
echo "$start_pattern" and "$end_pattern" not found in "$file" -- aborting 2>&1
|
|
exit 1
|
|
fi
|
|
}
|