Page MenuHomePhabricator
Differential D4558

[keyserver] Fix fetchKnownUserInfos
ClosedPublic
Actions

Authored by ashoat on Jul 18 2022, 11:45 AM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Apr 8, 7:51 PM
Unknown Object (File)
Mon, Apr 7, 1:25 AM
Unknown Object (File)
Thu, Mar 27, 5:30 PM
Unknown Object (File)
Mar 17 2025, 11:41 AM
Unknown Object (File)
Mar 16 2025, 9:43 AM
Unknown Object (File)
Mar 16 2025, 1:27 AM
Unknown Object (File)
Mar 16 2025, 1:27 AM
Unknown Object (File)
Mar 12 2025, 3:35 PM
View All Files
Subscribers
• abosh
• adrian

Details

Reviewers
• jacek
atul
tomek
Commits
rCOMM69b3a66efe71: [keyserver] Fix fetchKnownUserInfos
Summary

More context in Linear issue. This diff fixes an issue introduced in D4530.

In that diff I reordered the UNION SELECT list without reordering the SELECT list. Oops!

Test Plan

This time I definitely tested both MySQL 5.7 and MariaDB 10.8 and made sure that ENG-1409 is resolved on both

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
keyserver/
src/
fetchers/
5 lines

Diff 14589

View Options

keyserver/src/fetchers/user-fetchers.js

Show All 18 Lines build:
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: Install Developer certificate - name: Install Developer certificate
env: env:
MACOS_BUILD_CERTIFICATE_BASE64: ${{ secrets.MACOS_BUILD_CERTIFICATE_BASE64 }} MACOS_BUILD_CERTIFICATE_BASE64: ${{ secrets.MACOS_BUILD_CERTIFICATE_BASE64 }}
MACOS_BUILD_P12_PASSWORD: ${{ secrets.MACOS_BUILD_P12_PASSWORD }} MACOS_BUILD_P12_PASSWORD: ${{ secrets.MACOS_BUILD_P12_PASSWORD }}
MACOS_PROVISIONPROFILE_BASE64: ${{ secrets.MACOS_PROVISIONPROFILE_BASE64 }}
KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }} KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
run: | run: |
# create variables # create variables
CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12 CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
PROVISIONPROFILE_PATH=$GITHUB_WORKSPACE/desktop/macOS_App_Provisioning_Profile.provisionprofile
# import certificate from secrets # import certificate from secrets
echo -n "$MACOS_BUILD_CERTIFICATE_BASE64" | base64 --decode --output $CERTIFICATE_PATH echo -n "$MACOS_BUILD_CERTIFICATE_BASE64" | base64 --decode --output $CERTIFICATE_PATH
# create temporary keychain # create temporary keychain
security create-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH security create-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
security set-keychain-settings -lut 21600 $KEYCHAIN_PATH security set-keychain-settings -lut 21600 $KEYCHAIN_PATH
security unlock-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH security unlock-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
# import certificate to keychain # import certificate to keychain
security import $CERTIFICATE_PATH -P "$MACOS_BUILD_P12_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH security import $CERTIFICATE_PATH -P "$MACOS_BUILD_P12_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
security list-keychain -d user -s $KEYCHAIN_PATH security list-keychain -d user -s $KEYCHAIN_PATH
# import provisioning profile from secrets
echo -n "$MACOS_PROVISIONPROFILE_BASE64" | base64 --decode --output $PROVISIONPROFILE_PATH
- name: sudo ./install_protobuf.sh - name: sudo ./install_protobuf.sh
working-directory: ./scripts working-directory: ./scripts
run: sudo ./install_protobuf.sh run: sudo ./install_protobuf.sh
- name: npm install -g yarn - name: npm install -g yarn
run: npm install -g yarn run: npm install -g yarn
- name: yarn ci-cleaninstall - name: yarn ci-cleaninstall
Show All 21 Lines