Skip to content

[WIP][IMPROVEMENT] Enforce HTTPS on server URL #2349

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.

Sign up for GitHub

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

Closed
diegolmello wants to merge 3 commits into from
Closed

[WIP][IMPROVEMENT] Enforce HTTPS on server URL #2349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0243912
Stop accepting HTTP and show changes on server URL TextInput
diegolmello Jul 28, 2020
f86a69d
Enforce https on host notification
diegolmello Jul 28, 2020
9eccc17
Comment dx
diegolmello Jul 28, 2020
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
5 changes: 3 additions & 2 deletions app/sagas/deepLinking.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@ const handleOpen = function* handleOpen({ params }) {

let { host } = params;
if (!/^(http|https)/.test(host)) {
host = `https://${ params.host }`;
host = `https://${ host }`;
} else {
host = host.replace('http://', 'https://');
}
// remove last "/" from host
if (host.slice(-1) === '/') {
Expand All @@ -75,7 +77,6 @@ const handleOpen = function* handleOpen({ params }) {
RNUserDefaults.get(`${ RocketChat.TOKEN_KEY }-${ host }`)
]);

// TODO: needs better test
// if deep link is from same server
if (server === host && user) {
const connected = yield select(state => state.server.connected);
Expand Down
6 changes: 5 additions & 1 deletion app/views/NewServerView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@ class NewServerView extends React.Component {
handleNewServerEvent = (event) => {
let { server } = event;
const { connectServer } = this.props;
this.setState({ text: server });
server = this.completeUrl(server);
this.setState({ text: server });
connectServer(server);
}

Expand Down Expand Up @@ -163,6 +163,7 @@ class NewServerView extends React.Component {
if (text) {
Keyboard.dismiss();
const server = this.completeUrl(text);
this.setState({ text: server });
await this.basicAuth(server, text);
connectServer(server, cert);
}
Expand Down Expand Up @@ -225,11 +226,14 @@ class NewServerView extends React.Component {
url = `${ url }.rocket.chat`;
}

// Comment to test local server on Android device

@djorkaeffalexandre djorkaeffalexandre Jul 28, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can use __DEV__ here, just to new devs don't worry about that.

if (/^(https?:\/\/)?(((\w|[0-9-_])+(\.(\w|[0-9-_])+)+)|localhost)(:\d+)?$/.test(url)) {
if (/^localhost(:\d+)?/.test(url)) {
url = `http://${ url }`;
} else if (/^https?:\/\//.test(url) === false) {
url = `https://${ url }`;
} else if (/^http:\/\//.test(url)) {
url = url.replace('http://', 'https://');
}
}

Expand Down