X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/2af0840ff314f9d1e0265a4a1b50fc6db4af9047..dae3dcf87edcfc0648cd0b93b069b0eee67d3ab7:/app/models/client_application.rb

diff --git a/app/models/client_application.rb b/app/models/client_application.rb
index 11422e481..156eeafc7 100644
--- a/app/models/client_application.rb
+++ b/app/models/client_application.rb
@@ -10,7 +10,8 @@ class ClientApplication < ActiveRecord::Base
   validates :key, :presence => true, :uniqueness => true
   validates :name, :url, :secret, :presence => true
   validates :url, :format => %r{\Ahttp(s?)://(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(/|/([\w#!:.?+=&%@!\-/]))?}i
-  validates :support_url, :callback_url, :allow_blank => true, :format => %r{\Ahttp(s?)://(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(/|/([\w#!:.?+=&%@!\-/]))?}i
+  validates :support_url, :allow_blank => true, :format => %r{\Ahttp(s?)://(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(/|/([\w#!:.?+=&%@!\-/]))?}i
+  validates :callback_url, :allow_blank => true, :format => %r{\A[a-z][a-z0-9.+-]*://(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(/|/([\w#!:.?+=&%@!\-/]))?}i
 
   before_validation :generate_keys, :on => :create
 
@@ -76,7 +77,7 @@ class ClientApplication < ActiveRecord::Base
   # can agree or not agree to each of them.
   PERMISSIONS = [:allow_read_prefs, :allow_write_prefs, :allow_write_diary,
                  :allow_write_api, :allow_read_gpx, :allow_write_gpx,
-                 :allow_write_notes]
+                 :allow_write_notes].freeze
 
   def generate_keys
     self.key = OAuth::Helper.generate_key(40)[0, 40]