Issue 5254 - Improve URL verification when whitelisting domains

adblockplussbrowser/src/org/adblockplus/sbrowser/contentblocker/UrlInputOpenerPreference.java

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package org.adblockplus.sbrowser.contentblocker;
 
 import android.app.AlertDialog;
 import android.content.Context;
 import android.os.Bundle;
 import android.preference.EditTextPreference;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.TextWatcher;
 import android.util.AttributeSet;
-import android.util.Patterns;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.inputmethod.EditorInfo;
 import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import org.adblockplus.adblockplussbrowser.R;
 import org.adblockplus.sbrowser.contentblocker.util.PreferenceUtils;
+import org.apache.commons.validator.routines.DomainValidator;
 
 public class UrlInputOpenerPreference extends EditTextPreference implements TextWatcher,
     TextView.OnEditorActionListener
 {
 
   private OnUrlReadyListener onUrlReadyListener;
   private AlertDialog mAlertDialog;
 
   public UrlInputOpenerPreference(Context context)
   {
@@ skipping 79 matching lines @@
     PreferenceUtils.setMultilineTitle(view);
   }
 
   public void setOnUrlReadyListener(OnUrlReadyListener listener)
   {
     this.onUrlReadyListener = listener;
   }
 
   private boolean isValidUrl()
   {
-    return Patterns.WEB_URL.matcher(getUrl()).matches();
+    return DomainValidator.getInstance().isValid(getUrl());

[anton, 2017/07/06 06:51:10]

it's misleading - we validate URL with Apache DOMAIN validator. Can you please
explain it?
Also note UrlValidator exists
(https://commons.apache.org/proper/commons-validator/apidocs/org/apache/common...)
in Apache Commons.

Can/shouldn't we rename the method to isValidDomain()?

[jens, 2017/07/06 08:49:06]

The purpose of this change is, to have a reliable check if a TLD is valid.
That's why I use DomainValidator. But adjusting the method name would make
sense, that's right.

   }
 
   private String getUrl()
   {
     return getEditText().getText().toString();
   }
 
   private void setPositiveButtonEnabled(boolean enabled)
   {
     if (mAlertDialog != null)
     {
       mAlertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(enabled);
     }
   }
 
   public interface OnUrlReadyListener
   {
     void onUrlReady(String url);
   }
 }