From: Tom Hughes <tom@compton.nu>
Date: Wed, 11 May 2011 21:21:58 +0000 (+0100)
Subject: Simplify URL scheme name matching in OAuth callback URLs a little
X-Git-Tag: live~6299^2~7
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/6d5c551a7c0c7002acdc62eb9ec1041866da6f84

Simplify URL scheme name matching in OAuth callback URLs a little
---

diff --git a/app/models/client_application.rb b/app/models/client_application.rb
index 63c46a46f..ffca1c63c 100644
--- a/app/models/client_application.rb
+++ b/app/models/client_application.rb
@@ -9,7 +9,7 @@ class ClientApplication < ActiveRecord::Base
   
   validates_format_of :url, :with => /\Ahttp(s?):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/i
   validates_format_of :support_url, :with => /\Ahttp(s?):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/i, :allow_blank=>true
-  validates_format_of :callback_url, :with => /\A([a-z]){1}([\w0-9\.\+\-])*:\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/i, :allow_blank=>true
+  validates_format_of :callback_url, :with => /\A[a-z][a-z0-9.+-]*:\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/i, :allow_blank=>true
 
   attr_accessor :token_callback_url