Page MenuHomePhabricator
Differential D8007

[keyserver] Filter `MANAGE_INVITE_LINKS` permission for `native` `codeVersions` < 221
ClosedPublic
Actions

Authored by atul on May 26 2023, 1:46 PM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Apr 9, 12:50 AM
Unknown Object (File)
Tue, Apr 8, 11:26 PM
Unknown Object (File)
Tue, Apr 8, 10:47 PM
Unknown Object (File)
Wed, Apr 2, 3:57 AM
Unknown Object (File)
Thu, Mar 20, 3:18 AM
Unknown Object (File)
Wed, Mar 19, 11:19 PM
Unknown Object (File)
Mar 17 2025, 12:39 PM
Unknown Object (File)
Mar 4 2025, 5:55 AM
View All 96 Files
Subscribers
tomek

Details

Reviewers
ashoat
Commits
rCOMM615e4e2804f9: [keyserver] Filter `MANAGE_INVITE_LINKS` permission for `native` `codeVersions`…
Summary

Matches what we did to filter permissions for EDIT_THREAD_AVATAR and MANAGE_PINS.

Test Plan

Close reading, can be tested by logging into client w/ codeVersion < 221 and ensuring that MANAGE_INVITE_LINKS is missing in Redux store.

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
keyserver/
src/
fetchers/
4 lines
lib/
shared/
7 lines

Diff 27116

View Options

keyserver/src/fetchers/thread-fetchers.js

Show First 20 Lines • Show All 54 Lines • ▼ Show 20 Lines text = ''
if [[ ! -d "$MARIADB_DATA_HOME"/mysql ]]; then if [[ ! -d "$MARIADB_DATA_HOME"/mysql ]]; then
# mysql directory should exist if MariaDB has been initialized # mysql directory should exist if MariaDB has been initialized
echo "Initializing MariaDB database at $MARIADB_DATA_HOME" >&2 echo "Initializing MariaDB database at $MARIADB_DATA_HOME" >&2
"${lib.getBin mariadb}/bin/mariadb-install-db" \ "${lib.getBin mariadb}/bin/mariadb-install-db" \
--datadir="$MARIADB_DATA_HOME" \ --datadir="$MARIADB_DATA_HOME" \
--auth-root-authentication-method=socket --auth-root-authentication-method=socket
fi fi
# Check if MariaDB server was already started "${../scripts/start_comm_daemon.sh}" \
set +e # allow for pgrep to not find matches mariadbd \
# BSD pgrep doesn't have a "count" feature, use wc then trim whitespace MariaDB \
mariadb_count=$(pgrep mariadbd | wc -l | xargs echo) "${mariadb-entrypoint}/bin/mariadb-init" \
set -e "$MARIADB_PIDFILE"
if [[ "$mariadb_count" -eq "0" ]]; then
echo "Starting MariaDB server"
# No MariaDB present, start our own
# Launch in subshell so if the original terminal is closed, the process
# will be inherited instead of also being forced closed
("${mariadb-entrypoint}/bin/mariadb-init" &
echo "$!" > "$MARIADB_PIDFILE")
echo "Waiting for MariaDB to come up" echo "Waiting for MariaDB to come up"
while [[ ! -S "$MYSQL_UNIX_PORT" ]]; do sleep 1; done while [[ ! -S "$MYSQL_UNIX_PORT" ]]; do sleep 1; done
elif [[ "$mariadb_count" -eq "1" ]]; then
# Check if it was started by this script
running_pid="$(pgrep mariadbd)"
if [[ ! -f "$MARIADB_PIDFILE" ]] || \
[[ "$(cat "$MARIADB_PIDFILE")" != "$running_pid" ]]; then
echo "Existing MariaDB instance found outside of nix environment" >&2
echo "Please stop existing services and attempt 'mariadb-up' again" >&2
exit 1
fi
else
echo "Many MariaDB instances found outside of nix environment" >&2
echo "Please stop existing services and attempt 'mariadb-up' again" >&2
exit 1
fi
# Initialize comm user, database, and secrets file for MariaDB # Initialize comm user, database, and secrets file for MariaDB
# Connecting through socket doesn't require a password # Connecting through socket doesn't require a password
userCount=$("${lib.getBin mariadb}/bin/mariadb" -u "$USER" \ userCount=$("${lib.getBin mariadb}/bin/mariadb" -u "$USER" \
-Bse "SELECT COUNT(1) FROM mysql.user WHERE user = 'comm';" -Bse "SELECT COUNT(1) FROM mysql.user WHERE user = 'comm';"
) )
if [[ "$userCount" -eq 0 ]]; then if [[ "$userCount" -eq 0 ]]; then
PASS=$("${lib.getBin openssl}/bin/openssl" rand -hex 6) PASS=$("${lib.getBin openssl}/bin/openssl" rand -hex 6)
Show All 29 Lines
View Options

lib/shared/thread-utils.js

Show First 20 Lines • Show All 54 Lines • ▼ Show 20 Lines text = ''
if [[ ! -d "$MARIADB_DATA_HOME"/mysql ]]; then if [[ ! -d "$MARIADB_DATA_HOME"/mysql ]]; then
# mysql directory should exist if MariaDB has been initialized # mysql directory should exist if MariaDB has been initialized
echo "Initializing MariaDB database at $MARIADB_DATA_HOME" >&2 echo "Initializing MariaDB database at $MARIADB_DATA_HOME" >&2
"${lib.getBin mariadb}/bin/mariadb-install-db" \ "${lib.getBin mariadb}/bin/mariadb-install-db" \
--datadir="$MARIADB_DATA_HOME" \ --datadir="$MARIADB_DATA_HOME" \
--auth-root-authentication-method=socket --auth-root-authentication-method=socket
fi fi
# Check if MariaDB server was already started "${../scripts/start_comm_daemon.sh}" \
set +e # allow for pgrep to not find matches mariadbd \
# BSD pgrep doesn't have a "count" feature, use wc then trim whitespace MariaDB \
mariadb_count=$(pgrep mariadbd | wc -l | xargs echo) "${mariadb-entrypoint}/bin/mariadb-init" \
set -e "$MARIADB_PIDFILE"
if [[ "$mariadb_count" -eq "0" ]]; then
echo "Starting MariaDB server"
# No MariaDB present, start our own
# Launch in subshell so if the original terminal is closed, the process
# will be inherited instead of also being forced closed
("${mariadb-entrypoint}/bin/mariadb-init" &
echo "$!" > "$MARIADB_PIDFILE")
echo "Waiting for MariaDB to come up" echo "Waiting for MariaDB to come up"
while [[ ! -S "$MYSQL_UNIX_PORT" ]]; do sleep 1; done while [[ ! -S "$MYSQL_UNIX_PORT" ]]; do sleep 1; done
elif [[ "$mariadb_count" -eq "1" ]]; then
# Check if it was started by this script
running_pid="$(pgrep mariadbd)"
if [[ ! -f "$MARIADB_PIDFILE" ]] || \
[[ "$(cat "$MARIADB_PIDFILE")" != "$running_pid" ]]; then
echo "Existing MariaDB instance found outside of nix environment" >&2
echo "Please stop existing services and attempt 'mariadb-up' again" >&2
exit 1
fi
else
echo "Many MariaDB instances found outside of nix environment" >&2
echo "Please stop existing services and attempt 'mariadb-up' again" >&2
exit 1
fi
# Initialize comm user, database, and secrets file for MariaDB # Initialize comm user, database, and secrets file for MariaDB
# Connecting through socket doesn't require a password # Connecting through socket doesn't require a password
userCount=$("${lib.getBin mariadb}/bin/mariadb" -u "$USER" \ userCount=$("${lib.getBin mariadb}/bin/mariadb" -u "$USER" \
-Bse "SELECT COUNT(1) FROM mysql.user WHERE user = 'comm';" -Bse "SELECT COUNT(1) FROM mysql.user WHERE user = 'comm';"
) )
if [[ "$userCount" -eq 0 ]]; then if [[ "$userCount" -eq 0 ]]; then
PASS=$("${lib.getBin openssl}/bin/openssl" rand -hex 6) PASS=$("${lib.getBin openssl}/bin/openssl" rand -hex 6)
Show All 29 Lines