Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Prevents links to navigate to outside of the server URL #2501

Merged
merged 2 commits into from
Sep 19, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions src/injected.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ const start = (): void => {
const { Meteor } = window.require('meteor/meteor');
const { Session } = window.require('meteor/session');
const { Tracker } = window.require('meteor/tracker');
const { ServiceConfiguration } = window.require(
'meteor/service-configuration'
);
const { UserPresence } = window.require('meteor/konecty:user-presence');
const { settings } = window.require('/app/settings');
const { getUserPreference } = window.require('/app/utils');
Expand Down Expand Up @@ -76,8 +79,20 @@ const start = (): void => {
}
});

Tracker.autorun(() => {
const loginsWithRedirect = ServiceConfiguration.configurations
.find({ loginStyle: 'redirect' }, { fields: { serverURL: 1 } })
.fetch();
const array = loginsWithRedirect.map(
(url: { serverURL: string }) => url?.serverURL
);
window.RocketChatDesktop.setServerAllowedRedirects(array || []);
});

Tracker.autorun(() => {
const { url, defaultUrl } = settings.get('Assets_background') || {};

console.log('Assets_background', url);
window.RocketChatDesktop.setBackground(url || defaultUrl);
});

Expand Down
1 change: 1 addition & 0 deletions src/servers/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export type Server = {
webContentsId?: number;
userLoggedIn?: boolean;
gitCommitHash?: string;
allowedRedirects?: string[];
};

export const enum ServerUrlResolutionStatus {
Expand Down
3 changes: 3 additions & 0 deletions src/servers/preload/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { setBadge } from './badge';
import { setFavicon } from './favicon';
import { setGitCommitHash } from './gitCommitHash';
import { getInternalVideoChatWindowEnabled } from './internalVideoChatWindow';
import { setServerAllowedRedirects } from './serverAllowedRedirects';
import { setBackground } from './sidebar';
import { setTitle } from './title';
import { setUrlResolver } from './urls';
Expand Down Expand Up @@ -44,6 +45,7 @@ export type RocketChatDesktopAPI = {
destroyNotification: (id: unknown) => void;
getInternalVideoChatWindowEnabled: () => boolean;
setGitCommitHash: (gitCommitHash: string) => void;
setServerAllowedRedirects: (allowedRedirects: string[]) => void;
};

export const RocketChatDesktop: RocketChatDesktopAPI = {
Expand All @@ -68,4 +70,5 @@ export const RocketChatDesktop: RocketChatDesktopAPI = {
destroyNotification,
getInternalVideoChatWindowEnabled,
setGitCommitHash,
setServerAllowedRedirects,
};
17 changes: 17 additions & 0 deletions src/servers/preload/serverAllowedRedirects.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import { dispatch } from '../../store';
import { WEBVIEW_ALLOWED_REDIRECTS_CHANGED } from '../../ui/actions';
import { Server } from '../common';
import { getServerUrl } from './urls';

export const setServerAllowedRedirects = (
allowedRedirects: Server['allowedRedirects']
): void => {
console.log('setServerAllowedRedirects', allowedRedirects);
dispatch({
type: WEBVIEW_ALLOWED_REDIRECTS_CHANGED,
payload: {
url: getServerUrl(),
allowedRedirects,
},
});
};
7 changes: 7 additions & 0 deletions src/servers/reducers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import {
WEBVIEW_READY,
WEBVIEW_ATTACHED,
WEBVIEW_GIT_COMMIT_HASH_CHANGED,
WEBVIEW_ALLOWED_REDIRECTS_CHANGED,
} from '../ui/actions';
import { SERVERS_LOADED } from './actions';
import { Server } from './common';
Expand All @@ -42,6 +43,7 @@ type ServersActionTypes =
| ActionOf<typeof WEBVIEW_TITLE_CHANGED>
| ActionOf<typeof WEBVIEW_UNREAD_CHANGED>
| ActionOf<typeof WEBVIEW_USER_LOGGED_IN>
| ActionOf<typeof WEBVIEW_ALLOWED_REDIRECTS_CHANGED>
| ActionOf<typeof WEBVIEW_FAVICON_CHANGED>
| ActionOf<typeof APP_SETTINGS_LOADED>
| ActionOf<typeof WEBVIEW_DID_START_LOADING>
Expand Down Expand Up @@ -111,6 +113,11 @@ export const servers: Reducer<Server[], ServersActionTypes> = (
return upsert(state, { url, userLoggedIn });
}

case WEBVIEW_ALLOWED_REDIRECTS_CHANGED: {
const { url, allowedRedirects } = action.payload;
return upsert(state, { url, allowedRedirects });
}

case WEBVIEW_SIDEBAR_STYLE_CHANGED: {
const { url, style } = action.payload;
return upsert(state, { url, style });
Expand Down
6 changes: 6 additions & 0 deletions src/ui/actions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ export const WEBVIEW_GIT_COMMIT_HASH_CHANGED =
export const WEBVIEW_TITLE_CHANGED = 'webview/title-changed';
export const WEBVIEW_UNREAD_CHANGED = 'webview/unread-changed';
export const WEBVIEW_USER_LOGGED_IN = 'webview/user-loggedin';
export const WEBVIEW_ALLOWED_REDIRECTS_CHANGED =
'webview/allowed-redirects-changed';
export const SETTINGS_SET_REPORT_OPT_IN_CHANGED =
'settings/set-bugsnag-opt-in-changed';
export const SETTINGS_SET_FLASHFRAME_OPT_IN_CHANGED =
Expand Down Expand Up @@ -130,6 +132,10 @@ export type UiActionTypeToPayloadMap = {
url: Server['url'];
gitCommitHash: Server['gitCommitHash'];
};
[WEBVIEW_ALLOWED_REDIRECTS_CHANGED]: {
url: Server['url'];
allowedRedirects: Server['allowedRedirects'];
};
[SETTINGS_SET_REPORT_OPT_IN_CHANGED]: boolean;
[SETTINGS_SET_FLASHFRAME_OPT_IN_CHANGED]: boolean;
[SETTINGS_SET_HARDWARE_ACCELERATION_OPT_IN_CHANGED]: boolean;
Expand Down
22 changes: 22 additions & 0 deletions src/ui/main/serverView/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,28 @@ export const attachGuestWebContentsEvents = async (): Promise<void> => {
event.preventDefault();
}
);

const servers = select(({ servers }) => servers);
// prevent the guest webContents from navigating away from the server URL
guestWebContents.on('will-navigate', (e, redirectUrl) => {
const server = servers.find(
(server) => server.url === action.payload.url
);

const isAllowedRedirect =
server &&
server.allowedRedirects &&
server.allowedRedirects.findIndex((allowedRedirect) =>
redirectUrl.startsWith(allowedRedirect)
) > -1;

console.log('isAllowedRedirect', isAllowedRedirect);

if (!redirectUrl.startsWith(action.payload.url) && !isAllowedRedirect) {
e.preventDefault();
shell.openExternal(redirectUrl);
}
});
});

listen(WEBVIEW_ATTACHED, (action) => {
Expand Down