Pro backend 0.2 + libsession 1.7 compatibility updates

protos/SignalService.proto

@@ -370,9 +370,9 @@ message GroupUpdateDeleteMemberContentMessage {
 
 message ProProof {
   optional uint32 version           = 1;
-  optional bytes  genIndexHash      = 2;
+  optional bytes  revocationTag      = 2;
   optional bytes  rotatingPublicKey = 3;
-  optional uint64 expireAtMs        = 4; // Epoch timestamp in milliseconds
+  optional uint64 expiryUnixTs      = 4; // Epoch timestamp in whole seconds (what the Session Pro backend signs over)
   optional bytes  sig               = 5;
 }
 

ts/components/basic/Localizer.tsx

@@ -37,6 +37,14 @@ const StyledHtmlRenderer = styled.span`
 
 export type WithAsTag = { asTag?: LocalizerHtmlTag };
 export type WithClassName = { className?: string };
+/**
+ * Names of args whose value is trusted, pre-formatted HTML that should skip the arg-level escaping
+ * applied when the template contains formatting tags. Safe only for app-controlled content: the final
+ * string is still run through DOMPurify (the {@link supportedFormattingTags} whitelist) by
+ * SessionHtmlRenderer, so only formatting survives — never scripts or attributes. NEVER list a
+ * user-controlled arg here.
+ */
+export type WithHtmlArgs = { htmlArgs?: Array<string> };
 
 /**
  * Retrieve a localized message string, substituting dynamic parts where necessary and formatting it as HTML if necessary.
@@ -48,14 +56,32 @@ export type WithClassName = { className?: string };
  * @returns The localized message string with substitutions and formatting applied.
  */
 export const Localizer = <T extends MergedLocalizerTokens>(
-  props: GetMessageArgs<T> & WithAsTag & WithClassName
+  props: GetMessageArgs<T> & WithAsTag & WithClassName & WithHtmlArgs
 ) => {
   const args = messageArgsToArgsOnly(props);
 
   let rawString: string = getRawMessage<T>(getCrowdinLocale(), props);
 
   const containsFormattingTags = createSupportedFormattingTagsRegex().test(rawString);
-  const cleanArgs = args && containsFormattingTags ? sanitizeArgs(args) : args;
+  // When the template has formatting tags we HTML-escape the args so dynamic values can't inject
+  // markup. Args named in `htmlArgs` opt out of that escaping so they can carry trusted, pre-formatted
+  // HTML (e.g. a client-built <br/>• list) — still XSS-safe because SessionHtmlRenderer runs DOMPurify
+  // (supportedFormattingTags whitelist) on the final string.
+  const cleanArgs = ((): typeof args => {
+    if (!args || !containsFormattingTags) {
+      return args;
+    }
+    const htmlArgKeys = props.htmlArgs;
+    if (!htmlArgKeys?.length) {
+      return sanitizeArgs(args) as typeof args;
+    }
+    const toSanitize: Record<string, number | string> = {};
+    const trusted: Record<string, number | string> = {};
+    for (const [key, value] of Object.entries(args as Record<string, number | string>)) {
+      (htmlArgKeys.includes(key) ? trusted : toSanitize)[key] = value;
+    }
+    return { ...sanitizeArgs(toSanitize), ...trusted } as typeof args;
+  })();
 
   const containsIcons = !!(cleanArgs && Object.keys(cleanArgs).includes('icon'));
   if (containsIcons && (cleanArgs as any).icon) {

ts/components/dialog/ProCTADescription.tsx

@@ -9,7 +9,7 @@ import { formatNumber } from '../../util/i18n/formatting/generics';
 import { assertUnreachable } from '../../types/sqlSharedTypes';
 import { ProIconButton } from '../buttons/ProButton';
 import { CTAVariant, type ProCTAVariant } from './cta/types';
-import { useProBackendProDetails } from '../../state/selectors/proBackendData';
+import { useProBackendProStatus } from '../../state/selectors/proBackendData';
 
 const variantsWithoutFeatureList = [
   CTAVariant.PRO_GROUP_NON_ADMIN,
@@ -96,7 +96,7 @@ function FeatureList({ variant }: { variant: CTAVariant }) {
 }
 
 function ProExpiringSoonDescription() {
-  const { data } = useProBackendProDetails();
+  const { data } = useProBackendProStatus();
   return <Localizer token="proExpiringSoonDescription" time={data.expiryTimeRelativeString} />;
 }
 

ts/components/dialog/debug/FeatureFlags.tsx

@@ -2,7 +2,7 @@ import { isBoolean, isNil } from 'lodash';
 import { Dispatch, useCallback, useEffect, useMemo, useState } from 'react';
 import { clipboard } from 'electron';
 import useAsync from 'react-use/lib/useAsync';
-import { ProConfig, type ProProof } from 'libsession_util_nodejs';
+import { ProConfig } from 'libsession_util_nodejs';
 import { getAppDispatch } from '../../../state/dispatch';
 import {
   getDataFeatureFlag,
@@ -41,7 +41,7 @@ import {
 import { UserConfigWrapperActions } from '../../../webworker/workers/browser/libsession/libsession_worker_userconfig_interface';
 import { isDebugMode } from '../../../shared/env_vars';
 import {
-  useProBackendProDetails,
+  useProBackendProStatus,
   useProBackendRefetch,
 } from '../../../state/selectors/proBackendData';
 import ProBackendAPI from '../../../session/apis/pro_backend_api/ProBackendAPI';
@@ -740,7 +740,7 @@ function ProConfigForm({
   );
   const [sigInput, setSigInput] = useState<string>(proConfig?.proProof.signatureHex ?? '');
   const [genHashInput, setGenHashInput] = useState<string>(
-    proConfig?.proProof.genIndexHashB64 ?? ''
+    proConfig?.proProof.revocationTagB64 ?? ''
   );
   const [versionInput, setVersionInput] = useState<string>(
     proConfig?.proProof.version.toString() ?? ''
@@ -780,7 +780,7 @@ function ProConfigForm({
 }
 
 function ProConfigManager({ forceUpdate }: { forceUpdate: () => void }) {
-  const { isFetching } = useProBackendProDetails();
+  const { isFetching } = useProBackendProStatus();
   const refetch = useProBackendRefetch();
   const [proConfig, setProConfig] = useState<ProConfig | null>(null);
   const getProConfig = useCallback(async () => {
@@ -829,7 +829,7 @@ export const ProDebugSection = ({
 
   const resetPro = useCallback(async () => {
     await UserConfigWrapperActions.removeProConfig();
-    await Storage.remove(SettingsKey.proDetails);
+    await Storage.remove(SettingsKey.proStatus);
     await Storage.remove(SettingsKey.proExpiringSoonCTA);
     await Storage.remove(SettingsKey.proExpiredCTA);
     dispatch(proBackendDataActions.reset({ key: 'details' }));
@@ -907,10 +907,10 @@ export const ProDebugSection = ({
               if (!proAvailable) {
                 return;
               }
-              dispatch(proBackendDataActions.refreshGetProDetailsFromProBackend({}) as any);
+              dispatch(proBackendDataActions.refreshGetProStatusFromProBackend({}) as any);
             }}
           >
-            Refresh Pro Details
+            Refresh Pro Status
           </DebugButton>
           <DebugButton
             onClick={async () => {
@@ -924,15 +924,12 @@ export const ProDebugSection = ({
               if (getFeatureFlag('debugServerRequests')) {
                 window?.log?.debug('getProProof response: ', response);
               }
-              if (response?.status_code === 200) {
-                const proProof: ProProof = {
-                  expiryMs: response.result.expiry_unix_ts_ms,
-                  genIndexHashB64: response.result.gen_index_hash_b64,
-                  rotatingPubkeyHex: response.result.rotating_pkey_hex,
-                  version: response.result.version,
-                  signatureHex: response.result.sig_hex,
-                };
-                await UserConfigWrapperActions.setProConfig({ proProof, rotatingSeedHex });
+              if (response && response.status === 'ok') {
+                // libsession returns a ready-made ProProof; relay it verbatim.
+                await UserConfigWrapperActions.setProConfig({
+                  proProof: response.proof,
+                  rotatingSeedHex,
+                });
               }
             }}
           >
@@ -941,13 +938,13 @@ export const ProDebugSection = ({
           <DebugButton
             onClick={async () => {
               const masterPrivKeyHex = await getProMasterKeyHex();
-              const response = await ProBackendAPI.getProDetails({ masterPrivKeyHex });
+              const response = await ProBackendAPI.getProStatus({ masterPrivKeyHex });
               if (getFeatureFlag('debugServerRequests')) {
-                window?.log?.debug('Pro Details: ', response);
+                window?.log?.debug('Pro Status: ', response);
               }
             }}
           >
-            Get Pro Details
+            Get Pro Status
           </DebugButton>
           <DebugButton
             hide={!proAvailable}
@@ -983,7 +980,7 @@ export const ProDebugSection = ({
         label="Current Status"
         flag="mockProCurrentStatus"
         options={[
-          { label: 'Never Had Pro', value: ProStatus.NeverBeenPro },
+          { label: 'Never Had Pro', value: ProStatus.Never },
           { label: 'Active', value: ProStatus.Active },
           { label: 'Expired', value: ProStatus.Expired },
         ]}
@@ -1007,7 +1004,7 @@ export const ProDebugSection = ({
         visibleWithBooleanFlag="proAvailable"
         visibleWithEnumFlag={{
           flag: 'mockProCurrentStatus',
-          isVisible: v => v !== ProStatus.NeverBeenPro,
+          isVisible: v => v !== ProStatus.Never,
         }}
       />
       <FlagEnumDropdownInput
@@ -1023,7 +1020,7 @@ export const ProDebugSection = ({
         visibleWithBooleanFlag="proAvailable"
         visibleWithEnumFlag={{
           flag: 'mockProCurrentStatus',
-          isVisible: v => v !== ProStatus.NeverBeenPro,
+          isVisible: v => v !== ProStatus.Never,
         }}
       />
       <FlagEnumDropdownInput

ts/components/dialog/user-settings/pages/DefaultSettingsPage.tsx

@@ -41,7 +41,7 @@ import { APP_URL, DURATION_SECONDS } from '../../../../session/constants';
 import { getFeatureFlag } from '../../../../state/ducks/types/releasedFeaturesReduxTypes';
 import { useUserSettingsCloseAction } from './userSettingsHooks';
 import {
-  useProBackendProDetails,
+  useProBackendProStatus,
   useProBackendRefetch,
 } from '../../../../state/selectors/proBackendData';
 import { focusVisibleBoxShadowOutsetStr } from '../../../../styles/focusVisible';
@@ -330,7 +330,7 @@ const SessionInfo = () => {
 export const DefaultSettingPage = (modalState: UserSettingsModalState) => {
   const dispatch = getAppDispatch();
   const closeAction = useUserSettingsCloseAction(modalState);
-  const { t } = useProBackendProDetails();
+  const { t } = useProBackendProStatus();
   const refetch = useProBackendRefetch();
 
   const profileName = useOurConversationUsername() || '';