Skip to content

If enforced server, allow QR scanner, but validate url #16438

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

Merged
tobiasKaminsky merged 2 commits into from
Sep 14, 2026
Merged

If enforced server, allow QR scanner, but validate url #16438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d0cc34
If enforced server, allow QR scanner, but validate url
tobiasKaminsky Feb 4, 2026
ba4d1b6
fix codacy
alperozturk96 Feb 4, 2026
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
34 changes: 33 additions & 1 deletion app/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,6 @@ private void showEnforcedServers() {
showAuthStatus();
accountSetupBinding.hostUrlFrame.setVisibility(View.GONE);
accountSetupBinding.hostUrlInputHelperText.setVisibility(View.GONE);
accountSetupBinding.scanQr.setVisibility(View.GONE);
accountSetupBinding.serversSpinner.setVisibility(View.VISIBLE);

ArrayAdapter<String> adapter = new ArrayAdapter<>(this, R.layout.enforced_servers_spinner);
Expand Down Expand Up @@ -650,6 +649,13 @@ public void parseAndLoginFromWebView(String dataString) {
String prefix = getString(R.string.login_data_own_scheme) + PROTOCOL_SUFFIX + "login/";
LoginUrlInfo loginUrlInfo = parseLoginDataUrl(prefix, dataString);

if (!checkAllowedServers(loginUrlInfo.getServer())) {
mServerStatusIcon = R.drawable.ic_alert;
mServerStatusText = getString(R.string.server_not_allowed);
showServerStatus();
return;
}

if (accountSetupBinding != null) {
accountSetupBinding.hostUrlInput.setText("");
}
Expand All @@ -660,10 +666,36 @@ public void parseAndLoginFromWebView(String dataString) {
mServerStatusIcon = R.drawable.ic_alert;
mServerStatusText = getString(R.string.qr_could_not_be_read);
showServerStatus();
return;
}
checkOcServer();
}

private boolean checkAllowedServers(@NonNull String server) {
String webviewLogin = getString(R.string.webview_login_url);

if (!webviewLogin.isEmpty() && webviewLogin.startsWith(server)) {
return true;
}

String enforcedServerList = getString(R.string.enforce_servers);
Comment thread
alperozturk96 marked this conversation as resolved.

if (!enforcedServerList.isEmpty()) {
ArrayList<EnforcedServer> enforcedServers = new Gson().fromJson(enforcedServerList,
new TypeToken<ArrayList<EnforcedServer>>() {
}
.getType());

for (EnforcedServer enforcedServer : enforcedServers) {
if (enforcedServer.getUrl().startsWith(server)) {
return true;
}
}
}

return false;
}

/**
* parses a URI string and returns a login data object with the information from the URI string.
*
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1638,4 +1638,5 @@
<string name="player_control_view_play_pause_button_content_description">Play/Pause button</string>
<string name="player_control_view_next_button_content_description">Next button</string>
<string name="player_control_view_random_button_content_description">Random button</string>
<string name="server_not_allowed">Server not allowed</string>
</resources>
Loading