Page MenuHomePhabricator
Differential D10201

b[native] configure socket address on native with json file
AbandonedPublic
Actions

Authored by varun on Dec 5 2023, 8:39 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Apr 12, 7:25 AM
Unknown Object (File)
Sat, Mar 29, 9:55 PM
Unknown Object (File)
Mar 23 2025, 9:13 PM
Unknown Object (File)
Mar 23 2025, 9:13 PM
Unknown Object (File)
Feb 27 2025, 8:03 PM
Unknown Object (File)
Feb 27 2025, 7:13 PM
Unknown Object (File)
Feb 26 2025, 8:20 AM
Unknown Object (File)
Feb 24 2025, 8:41 AM
View All 59 Files
Subscribers
ashoat
tomek

Details

Reviewers
bartek
Summary

try to get identity service config from json file if it exists, otherwise just use default config

Depends on D10187

Test Plan

tbd

Diff Detail

Repository
rCOMM Comm
Branch
deleteuser (branched from master)
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

varun created this revision.Dec 5 2023, 8:39 PM
Herald added subscribers: tomek, ashoat. · View Herald TranscriptDec 5 2023, 8:39 PM
varun added a comment.Dec 5 2023, 8:44 PM

i meant to make this a draft diff.. i guess i can't undo that now. @bartek i'm having trouble reading from my native/facts/identity_service_config.json file because we build the native rust library and then Xcode links it in some sort of sandbox where the file isn't present. any thoughts on how to proceed here? i can just set the SOCKET_ADDR const in build.rs similar to how we set CODE_VERSION but wondering if there's a cleaner way...

varun published this revision for review.Dec 5 2023, 8:45 PM
varun planned changes to this revision.
In D10201#296285, @varun wrote:

i meant to make this a draft diff.. i guess i can't undo that now. @bartek i'm having trouble reading from my native/facts/identity_service_config.json file because we build the native rust library and then Xcode links it in some sort of sandbox where the file isn't present. any thoughts on how to proceed here? i can just set the SOCKET_ADDR const in build.rs similar to how we set CODE_VERSION but wondering if there's a cleaner way...

actually i think build.rs is the best solution

Harbormaster completed remote builds in B24817: Diff 34324.Dec 5 2023, 9:11 PM
ashoat added a comment.Dec 6 2023, 12:53 AM
In D10201#296286, @varun wrote:
In D10201#296285, @varun wrote:

i meant to make this a draft diff.. i guess i can't undo that now. @bartek i'm having trouble reading from my native/facts/identity_service_config.json file because we build the native rust library and then Xcode links it in some sort of sandbox where the file isn't present. any thoughts on how to proceed here? i can just set the SOCKET_ADDR const in build.rs similar to how we set CODE_VERSION but wondering if there's a cleaner way...

actually i think build.rs is the best solution

I'm confused – what is actually being configured in build.rs here? Shouldn't this diff be using get_config introduced in D10148? Is there something "broken" with D10148?

bartek added a comment.Dec 6 2023, 1:53 AM
In D10201#296313, @ashoat wrote:
In D10201#296286, @varun wrote:
In D10201#296285, @varun wrote:

i meant to make this a draft diff.. i guess i can't undo that now. @bartek i'm having trouble reading from my native/facts/identity_service_config.json file because we build the native rust library and then Xcode links it in some sort of sandbox where the file isn't present. any thoughts on how to proceed here? i can just set the SOCKET_ADDR const in build.rs similar to how we set CODE_VERSION but wondering if there's a cleaner way...

actually i think build.rs is the best solution

I'm confused – what is actually being configured in build.rs here? Shouldn't this diff be using get_config introduced in D10148? Is there something "broken" with D10148?

That diff is for keyserver only. Native apps don't support reading env vars in runtime - their runtime is smartphone or simulator, they should be separated from host machine. Also reading file at runtime on mobile app means searching for it on the device's disk (or emulator-specific directories).
React-Native/Expo provide hacks to expose env vars to JS via Metro bundler (I used this in natDevHostname) but for Rust the values need to be accessible in native code.

build.rs will work but it's cumbersome to rebuild native app just to change identity endpoint. On the other hand, passing values JS -> Rust sounds like lots of additional work (or am I wrong?). Wondering if there's a better solution.

ashoat added a comment.Dec 6 2023, 7:28 AM

Thanks for clarifying, @bartek! I definitely got myself confused there. We don't use getCommConfig in JS on native currently either, so I don't think there's any expectation to use get_config in Rust on native.

I share your concerns that build.rs is an unideal place to put this config, but I'm not sure of any alternatives. Don't want to block this diff if there are no obvious alternatives.

varun abandoned this revision.Dec 6 2023, 7:47 PM

thanks for explaining, @bartek :)

passing values JS -> Rust sounds like lots of additional work (or am I wrong?)

yeah it feels like a lot of unnecessary work... i'm think this task would make it easier though: https://linear.app/comm/issue/ENG-6026/avoid-creating-new-clients-each-time-we-call-grpc-client-methods

I'm going to abandon this diff and just update the previous one because i had to completely change my approach

Revision Contents
Changeset List

PathSize
native/
native_rust_library/
1 line
src/
41 lines
41 lines

Diff 34324

View Options

native/native_rust_library/Cargo.lock

Show First 20 Lines • Show All 156 Lines • ▼ Show 20 Lines () => ({
sessionID, sessionID,
}, },
}, },
}), }),
[preRequestUserInfo, keyserverID, cookie, sessionID], [preRequestUserInfo, keyserverID, cookie, sessionID],
); );
// We only need to do a "spot check" on this value below. // We only need to do a "spot check" on this value below.
// - To avoid regenerating performRecovery whenever it changes, we want to // - To avoid regenerating below callbacks whenever it changes, we want to
// make sure it's not in that function's dep list. // make sure it's not in those callbacks' dep lists.
// - If we exclude it from that function's dep list, we'll end up binding in // - If we exclude it from those callbacks' dep lists, we'll end up binding in
// the value of preRequestUserState at the time performRecovery is updated. // the value of preRequestUserState at the time the callbacks are updated.
// Instead, by assigning to a ref, we are able to use the latest value. // Instead, by assigning to a ref, we are able to use the latest value.
const preRequestUserStateRef = React.useRef(preRequestUserState); const preRequestUserStateRef = React.useRef(preRequestUserState);
preRequestUserStateRef.current = preRequestUserState; preRequestUserStateRef.current = preRequestUserState;
const dispatch = useDispatch(); const dispatch = useDispatch();
const urlPrefix = useSelector(urlPrefixSelector(keyserverID)); const urlPrefix = useSelector(urlPrefixSelector(keyserverID));
const logOut = useLogOut(); const logOut = useLogOut();
const dispatchActionPromise = useDispatchActionPromise(); const dispatchActionPromise = useDispatchActionPromise();
const invalidateKeyserverSession = React.useCallback( const invalidateKeyserverSession = React.useCallback(
( (
source: RecoveryActionSource, source: RecoveryActionSource,
sessionChange: ClientSessionChange, sessionChange: ClientSessionChange,
userStateBeforeRecovery: PreRequestUserState,
hasBeenCancelled: () => boolean, hasBeenCancelled: () => boolean,
) => { ) => {
if (hasBeenCancelled()) { if (hasBeenCancelled()) {
return; return;
} }
setNewSession( setNewSession(
dispatch, dispatch,
sessionChange, sessionChange,
userStateBeforeRecovery, preRequestUserStateRef.current,
null, null,
source, source,
keyserverID, keyserverID,
); );
if ( if (
keyserverID === authoritativeKeyserverID() && keyserverID === authoritativeKeyserverID() &&
relyingOnAuthoritativeKeyserver relyingOnAuthoritativeKeyserver
) { ) {
Show All 30 Lines ) => {
); );
const sessionChange = const sessionChange =
recoverySessionChange ?? genericCookieInvalidation; recoverySessionChange ?? genericCookieInvalidation;
if ( if (
sessionChange.cookieInvalidated || sessionChange.cookieInvalidated ||
!sessionChange.cookie || !sessionChange.cookie ||
!sessionChange.cookie.startsWith('user=') !sessionChange.cookie.startsWith('user=')
) { ) {
invalidateKeyserverSession( invalidateKeyserverSession(source, sessionChange, hasBeenCancelled);
source,
sessionChange,
userStateBeforeRecovery,
hasBeenCancelled,
);
} }
} catch (e) { } catch (e) {
if (hasBeenCancelled()) { if (hasBeenCancelled()) {
return; return;
} }
console.log( console.log(
`Error during recovery login with keyserver ${keyserverID}`, `Error during recovery login with keyserver ${keyserverID}`,
e, e,
); );
invalidateKeyserverSession( invalidateKeyserverSession(
source, source,
genericCookieInvalidation, genericCookieInvalidation,
userStateBeforeRecovery,
hasBeenCancelled, hasBeenCancelled,
); );
throw e; throw e;
} }
}, },
[keyserverID, dispatch, cookie, urlPrefix, invalidateKeyserverSession], [keyserverID, dispatch, cookie, urlPrefix, invalidateKeyserverSession],
); );
} }
export { export {
canResolveKeyserverSessionInvalidation, canResolveKeyserverSessionInvalidation,
resolveKeyserverSessionInvalidation, resolveKeyserverSessionInvalidation,
useKeyserverRecoveryLogIn, useKeyserverRecoveryLogIn,
}; };
View Options

native/native_rust_library/Cargo.toml

Show First 20 Lines • Show All 156 Lines • ▼ Show 20 Lines () => ({
sessionID, sessionID,
}, },
}, },
}), }),
[preRequestUserInfo, keyserverID, cookie, sessionID], [preRequestUserInfo, keyserverID, cookie, sessionID],
); );
// We only need to do a "spot check" on this value below. // We only need to do a "spot check" on this value below.
// - To avoid regenerating performRecovery whenever it changes, we want to // - To avoid regenerating below callbacks whenever it changes, we want to
// make sure it's not in that function's dep list. // make sure it's not in those callbacks' dep lists.
// - If we exclude it from that function's dep list, we'll end up binding in // - If we exclude it from those callbacks' dep lists, we'll end up binding in
// the value of preRequestUserState at the time performRecovery is updated. // the value of preRequestUserState at the time the callbacks are updated.
// Instead, by assigning to a ref, we are able to use the latest value. // Instead, by assigning to a ref, we are able to use the latest value.
const preRequestUserStateRef = React.useRef(preRequestUserState); const preRequestUserStateRef = React.useRef(preRequestUserState);
preRequestUserStateRef.current = preRequestUserState; preRequestUserStateRef.current = preRequestUserState;
const dispatch = useDispatch(); const dispatch = useDispatch();
const urlPrefix = useSelector(urlPrefixSelector(keyserverID)); const urlPrefix = useSelector(urlPrefixSelector(keyserverID));
const logOut = useLogOut(); const logOut = useLogOut();
const dispatchActionPromise = useDispatchActionPromise(); const dispatchActionPromise = useDispatchActionPromise();
const invalidateKeyserverSession = React.useCallback( const invalidateKeyserverSession = React.useCallback(
( (
source: RecoveryActionSource, source: RecoveryActionSource,
sessionChange: ClientSessionChange, sessionChange: ClientSessionChange,
userStateBeforeRecovery: PreRequestUserState,
hasBeenCancelled: () => boolean, hasBeenCancelled: () => boolean,
) => { ) => {
if (hasBeenCancelled()) { if (hasBeenCancelled()) {
return; return;
} }
setNewSession( setNewSession(
dispatch, dispatch,
sessionChange, sessionChange,
userStateBeforeRecovery, preRequestUserStateRef.current,
null, null,
source, source,
keyserverID, keyserverID,
); );
if ( if (
keyserverID === authoritativeKeyserverID() && keyserverID === authoritativeKeyserverID() &&
relyingOnAuthoritativeKeyserver relyingOnAuthoritativeKeyserver
) { ) {
Show All 30 Lines ) => {
); );
const sessionChange = const sessionChange =
recoverySessionChange ?? genericCookieInvalidation; recoverySessionChange ?? genericCookieInvalidation;
if ( if (
sessionChange.cookieInvalidated || sessionChange.cookieInvalidated ||
!sessionChange.cookie || !sessionChange.cookie ||
!sessionChange.cookie.startsWith('user=') !sessionChange.cookie.startsWith('user=')
) { ) {
invalidateKeyserverSession( invalidateKeyserverSession(source, sessionChange, hasBeenCancelled);
source,
sessionChange,
userStateBeforeRecovery,
hasBeenCancelled,
);
} }
} catch (e) { } catch (e) {
if (hasBeenCancelled()) { if (hasBeenCancelled()) {
return; return;
} }
console.log( console.log(
`Error during recovery login with keyserver ${keyserverID}`, `Error during recovery login with keyserver ${keyserverID}`,
e, e,
); );
invalidateKeyserverSession( invalidateKeyserverSession(
source, source,
genericCookieInvalidation, genericCookieInvalidation,
userStateBeforeRecovery,
hasBeenCancelled, hasBeenCancelled,
); );
throw e; throw e;
} }
}, },
[keyserverID, dispatch, cookie, urlPrefix, invalidateKeyserverSession], [keyserverID, dispatch, cookie, urlPrefix, invalidateKeyserverSession],
); );
} }
export { export {
canResolveKeyserverSessionInvalidation, canResolveKeyserverSessionInvalidation,
resolveKeyserverSessionInvalidation, resolveKeyserverSessionInvalidation,
useKeyserverRecoveryLogIn, useKeyserverRecoveryLogIn,
}; };
View Options

native/native_rust_library/src/config.rs

Show First 20 Lines • Show All 156 Lines • ▼ Show 20 Lines () => ({
sessionID, sessionID,
}, },
}, },
}), }),
[preRequestUserInfo, keyserverID, cookie, sessionID], [preRequestUserInfo, keyserverID, cookie, sessionID],
); );
// We only need to do a "spot check" on this value below. // We only need to do a "spot check" on this value below.
// - To avoid regenerating performRecovery whenever it changes, we want to // - To avoid regenerating below callbacks whenever it changes, we want to
// make sure it's not in that function's dep list. // make sure it's not in those callbacks' dep lists.
// - If we exclude it from that function's dep list, we'll end up binding in // - If we exclude it from those callbacks' dep lists, we'll end up binding in
// the value of preRequestUserState at the time performRecovery is updated. // the value of preRequestUserState at the time the callbacks are updated.
// Instead, by assigning to a ref, we are able to use the latest value. // Instead, by assigning to a ref, we are able to use the latest value.
const preRequestUserStateRef = React.useRef(preRequestUserState); const preRequestUserStateRef = React.useRef(preRequestUserState);
preRequestUserStateRef.current = preRequestUserState; preRequestUserStateRef.current = preRequestUserState;
const dispatch = useDispatch(); const dispatch = useDispatch();
const urlPrefix = useSelector(urlPrefixSelector(keyserverID)); const urlPrefix = useSelector(urlPrefixSelector(keyserverID));
const logOut = useLogOut(); const logOut = useLogOut();
const dispatchActionPromise = useDispatchActionPromise(); const dispatchActionPromise = useDispatchActionPromise();
const invalidateKeyserverSession = React.useCallback( const invalidateKeyserverSession = React.useCallback(
( (
source: RecoveryActionSource, source: RecoveryActionSource,
sessionChange: ClientSessionChange, sessionChange: ClientSessionChange,
userStateBeforeRecovery: PreRequestUserState,
hasBeenCancelled: () => boolean, hasBeenCancelled: () => boolean,
) => { ) => {
if (hasBeenCancelled()) { if (hasBeenCancelled()) {
return; return;
} }
setNewSession( setNewSession(
dispatch, dispatch,
sessionChange, sessionChange,
userStateBeforeRecovery, preRequestUserStateRef.current,
null, null,
source, source,
keyserverID, keyserverID,
); );
if ( if (
keyserverID === authoritativeKeyserverID() && keyserverID === authoritativeKeyserverID() &&
relyingOnAuthoritativeKeyserver relyingOnAuthoritativeKeyserver
) { ) {
Show All 30 Lines ) => {
); );
const sessionChange = const sessionChange =
recoverySessionChange ?? genericCookieInvalidation; recoverySessionChange ?? genericCookieInvalidation;
if ( if (
sessionChange.cookieInvalidated || sessionChange.cookieInvalidated ||
!sessionChange.cookie || !sessionChange.cookie ||
!sessionChange.cookie.startsWith('user=') !sessionChange.cookie.startsWith('user=')
) { ) {
invalidateKeyserverSession( invalidateKeyserverSession(source, sessionChange, hasBeenCancelled);
source,
sessionChange,
userStateBeforeRecovery,
hasBeenCancelled,
);
} }
} catch (e) { } catch (e) {
if (hasBeenCancelled()) { if (hasBeenCancelled()) {
return; return;
} }
console.log( console.log(
`Error during recovery login with keyserver ${keyserverID}`, `Error during recovery login with keyserver ${keyserverID}`,
e, e,
); );
invalidateKeyserverSession( invalidateKeyserverSession(
source, source,
genericCookieInvalidation, genericCookieInvalidation,
userStateBeforeRecovery,
hasBeenCancelled, hasBeenCancelled,
); );
throw e; throw e;
} }
}, },
[keyserverID, dispatch, cookie, urlPrefix, invalidateKeyserverSession], [keyserverID, dispatch, cookie, urlPrefix, invalidateKeyserverSession],
); );
} }
export { export {
canResolveKeyserverSessionInvalidation, canResolveKeyserverSessionInvalidation,
resolveKeyserverSessionInvalidation, resolveKeyserverSessionInvalidation,
useKeyserverRecoveryLogIn, useKeyserverRecoveryLogIn,
}; };
View Options

native/native_rust_library/src/lib.rs

Show First 20 Lines • Show All 156 Lines • ▼ Show 20 Lines () => ({
sessionID, sessionID,
}, },
}, },
}), }),
[preRequestUserInfo, keyserverID, cookie, sessionID], [preRequestUserInfo, keyserverID, cookie, sessionID],
); );
// We only need to do a "spot check" on this value below. // We only need to do a "spot check" on this value below.
// - To avoid regenerating performRecovery whenever it changes, we want to // - To avoid regenerating below callbacks whenever it changes, we want to
// make sure it's not in that function's dep list. // make sure it's not in those callbacks' dep lists.
// - If we exclude it from that function's dep list, we'll end up binding in // - If we exclude it from those callbacks' dep lists, we'll end up binding in
// the value of preRequestUserState at the time performRecovery is updated. // the value of preRequestUserState at the time the callbacks are updated.
// Instead, by assigning to a ref, we are able to use the latest value. // Instead, by assigning to a ref, we are able to use the latest value.
const preRequestUserStateRef = React.useRef(preRequestUserState); const preRequestUserStateRef = React.useRef(preRequestUserState);
preRequestUserStateRef.current = preRequestUserState; preRequestUserStateRef.current = preRequestUserState;
const dispatch = useDispatch(); const dispatch = useDispatch();
const urlPrefix = useSelector(urlPrefixSelector(keyserverID)); const urlPrefix = useSelector(urlPrefixSelector(keyserverID));
const logOut = useLogOut(); const logOut = useLogOut();
const dispatchActionPromise = useDispatchActionPromise(); const dispatchActionPromise = useDispatchActionPromise();
const invalidateKeyserverSession = React.useCallback( const invalidateKeyserverSession = React.useCallback(
( (
source: RecoveryActionSource, source: RecoveryActionSource,
sessionChange: ClientSessionChange, sessionChange: ClientSessionChange,
userStateBeforeRecovery: PreRequestUserState,
hasBeenCancelled: () => boolean, hasBeenCancelled: () => boolean,
) => { ) => {
if (hasBeenCancelled()) { if (hasBeenCancelled()) {
return; return;
} }
setNewSession( setNewSession(
dispatch, dispatch,
sessionChange, sessionChange,
userStateBeforeRecovery, preRequestUserStateRef.current,
null, null,
source, source,
keyserverID, keyserverID,
); );
if ( if (
keyserverID === authoritativeKeyserverID() && keyserverID === authoritativeKeyserverID() &&
relyingOnAuthoritativeKeyserver relyingOnAuthoritativeKeyserver
) { ) {
Show All 30 Lines ) => {
); );
const sessionChange = const sessionChange =
recoverySessionChange ?? genericCookieInvalidation; recoverySessionChange ?? genericCookieInvalidation;
if ( if (
sessionChange.cookieInvalidated || sessionChange.cookieInvalidated ||
!sessionChange.cookie || !sessionChange.cookie ||
!sessionChange.cookie.startsWith('user=') !sessionChange.cookie.startsWith('user=')
) { ) {
invalidateKeyserverSession( invalidateKeyserverSession(source, sessionChange, hasBeenCancelled);
source,
sessionChange,
userStateBeforeRecovery,
hasBeenCancelled,
);
} }
} catch (e) { } catch (e) {
if (hasBeenCancelled()) { if (hasBeenCancelled()) {
return; return;
} }
console.log( console.log(
`Error during recovery login with keyserver ${keyserverID}`, `Error during recovery login with keyserver ${keyserverID}`,
e, e,
); );
invalidateKeyserverSession( invalidateKeyserverSession(
source, source,
genericCookieInvalidation, genericCookieInvalidation,
userStateBeforeRecovery,
hasBeenCancelled, hasBeenCancelled,
); );
throw e; throw e;
} }
}, },
[keyserverID, dispatch, cookie, urlPrefix, invalidateKeyserverSession], [keyserverID, dispatch, cookie, urlPrefix, invalidateKeyserverSession],
); );
} }
export { export {
canResolveKeyserverSessionInvalidation, canResolveKeyserverSessionInvalidation,
resolveKeyserverSessionInvalidation, resolveKeyserverSessionInvalidation,
useKeyserverRecoveryLogIn, useKeyserverRecoveryLogIn,
}; };