jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SecureClientQuery moved to flipper-common

Browse Source 
Summary: It should've been there with ClientQuery.

Reviewed By: antonk52

Differential Revision: D47210314

fbshipit-source-id: 869496918648f20b616c1a612296fff55597af77
This commit is contained in:
Lorenzo Blasa
2023-07-04 09:01:26 -07:00
committed by Facebook GitHub Bot
parent f63e5d440a
commit 4a0ad8c1c3
9 changed files with 18 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
desktop/flipper-server-core/src/app-connectivity/BrowserServerWebSocket.tsx
View File

@@ -16,8 +16,7 @@ import {assertNotNull, parseClientQuery} from './Utilities';
import SecureServerWebSocket, {
SecureConnectionCtx,
} from './SecureServerWebSocket';
import {SecureClientQuery} from './ServerWebSocketBase';
import {ClientDescription, DeviceOS} from 'flipper-common';
import {ClientDescription, DeviceOS, SecureClientQuery} from 'flipper-common';
import {URL} from 'url';
import {isFBBuild} from '../fb-stubs/constants';

3
desktop/flipper-server-core/src/app-connectivity/SecureServerWebSocket.tsx
View File

@@ -8,9 +8,8 @@
*/
import ServerWebSocket, {ConnectionCtx} from './ServerWebSocket';
import {SecureClientQuery} from './ServerWebSocketBase';
import {ParsedUrlQuery} from 'querystring';
import {ClientDescription} from 'flipper-common';
import {ClientDescription, SecureClientQuery} from 'flipper-common';
import {
isWsResponseMessage,
parseSecureClientQuery,

6
desktop/flipper-server-core/src/app-connectivity/ServerController.tsx
View File

@@ -10,6 +10,7 @@
import {
ClientDescription,
ClientQuery,
SecureClientQuery,
isTest,
buildClientId,
Logger,
@@ -27,10 +28,7 @@ import {
assertNotNull,
cloneClientQuerySafeForLogging,
} from './Utilities';
import ServerWebSocketBase, {
SecureClientQuery,
ServerEventsListener,
} from './ServerWebSocketBase';
import ServerWebSocketBase, {ServerEventsListener} from './ServerWebSocketBase';
import {
createBrowserServer,
createServer,

8
desktop/flipper-server-core/src/app-connectivity/ServerRSocket.tsx
View File

@@ -7,11 +7,7 @@
* @format
*/
import {SecureServerConfig} from './certificate-exchange/certificate-utils';
import ServerWebSocketBase, {
SecureClientQuery,
ServerEventsListener,
} from './ServerWebSocketBase';
import ServerWebSocketBase, {ServerEventsListener} from './ServerWebSocketBase';
import tls from 'tls';
import net, {AddressInfo, Socket} from 'net';
import {RSocketServer} from 'rsocket-core';
@@ -27,8 +23,10 @@ import {
ClientDescription,
ClientQuery,
ClientResponseType,
SecureClientQuery,
} from 'flipper-common';
import {transformCertificateExchangeMediumToType} from './Utilities';
import {SecureServerConfig} from './certificate-exchange/certificate-utils';
/**
* RSocket based server. RSocket uses its own protocol for communication between

16
desktop/flipper-server-core/src/app-connectivity/ServerWebSocketBase.tsx
View File

@@ -11,25 +11,11 @@ import {ClientConnection} from './ClientConnection';
import {
ClientDescription,
ClientQuery,
SecureClientQuery,
SignCertificateMessage,
} from 'flipper-common';
import {SecureServerConfig} from './certificate-exchange/certificate-utils';
/**
* ClientCsrQuery defines a client query with CSR
* information.
*/
export type ClientCsrQuery = {
csr?: string | undefined;
csr_path?: string | undefined;
};
/**
* SecureClientQuery combines a ClientQuery with
* ClientCsrQuery. It also adds medium information.
*/
export type SecureClientQuery = ClientQuery & ClientCsrQuery;
/**
* Defines an interface for events triggered by a running server interacting
* with a client.

2
desktop/flipper-server-core/src/app-connectivity/Utilities.tsx
View File

@@ -10,11 +10,11 @@
import {
CertificateExchangeMedium,
ClientQuery,
SecureClientQuery,
DeviceOS,
ResponseMessage,
} from 'flipper-common';
import {ParsedUrlQuery} from 'querystring';
import {SecureClientQuery} from './ServerWebSocketBase';
/**
* Transforms the certificate exchange medium type as number to the

2
desktop/flipper-server-core/src/app-connectivity/__tests__/BrowserServerWebSocket.node.tsx
View File

@@ -12,13 +12,13 @@ import {
ExecuteMessage,
GetPluginsMessage,
ResponseMessage,
SecureClientQuery,
} from 'flipper-common';
import WebSocket from 'ws';
import {BrowserClientConnection} from '../BrowserClientConnection';
import {getFlipperServerConfig} from '../../FlipperServerConfig';
import BrowserServerWebSocket from '../BrowserServerWebSocket';
import {SecureClientQuery} from '../ServerWebSocketBase';
import {createMockSEListener, WSMessageAccumulator} from './utils';
jest.mock('../../FlipperServerConfig');

2
desktop/flipper-server-core/src/app-connectivity/__tests__/SecureServerWebSocket.node.tsx
View File

@@ -12,12 +12,12 @@ import {
ExecuteMessage,
GetPluginsMessage,
ResponseMessage,
SecureClientQuery,
} from 'flipper-common';
import {toBase64} from 'js-base64';
import WebSocket from 'ws';
import SecureServerWebSocket from '../SecureServerWebSocket';
import {SecureClientQuery} from '../ServerWebSocketBase';
import {transformCertificateExchangeMediumToType} from '../Utilities';
import WebSocketClientConnection from '../WebSocketClientConnection';
import {createMockSEListener, WSMessageAccumulator} from './utils';