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

Open
tobiasKaminsky wants to merge 2 commits into
base: master
Choose a base branch
from
Open

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
b5f273a
If enforced server, allow QR scanner, but validate url
tobiasKaminsky Feb 4, 2026
385b613
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
35 changes: 33 additions & 2 deletions 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 @@ -67,7 +67,6 @@
import com.nextcloud.operations.PostMethod;
import com.nextcloud.utils.extensions.BundleExtensionsKt;
import com.nextcloud.utils.mdm.MDMConfig;
import com.owncloud.android.BuildConfig;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import com.owncloud.android.databinding.AccountSetupBinding;
Expand Down Expand Up @@ -351,7 +350,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 @@ -639,6 +637,13 @@ private 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 @@ -649,10 +654,36 @@ private 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);
Copy link
Collaborator

@alperozturk96 alperozturk96 Feb 4, 2026

Choose a reason for hiding this comment

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

R.string.enforce_servers this will be empty and it is breaking debug login script. Please check.


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 @@ -1506,4 +1506,5 @@
<string name="sync_conflict_notification_title">File upload conflicts</string>
<string name="sync_conflict_notification_description">Upload conflicts detected. Open uploads to resolve.</string>
<string name="sync_conflict_notification_action_title">Resolve conflicts</string>
<string name="server_not_allowed">Server not allowed</string>
</resources>
Loading