govuk_content_models 31.3.0 → 31.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 958538091c31245d3c30d1007839a122b43e661b
-  data.tar.gz: d80419824d3224945339326583163a70c018fe9b
+  metadata.gz: 40258d79cad346c7ad24fd75eab16db040358d7c
+  data.tar.gz: fbcb1c49048321f69113c637c9abdd16a00391f8
 SHA512:
-  metadata.gz: ce9da9e40bc9b2fb21aaa114b1713e4c495b0ce74ed7d5370d5be96d91a0fd622fd77930078701913d7afdbbe77d3ec936fd6a858efe282bcaf1412e3afb5b44
-  data.tar.gz: dd73d319e49c6c15db262f85f25e8d2eb6ebe9389a76dfc62ed5325592eeac4b95b30c00830dc9dfe1d5960109f4917acde09f3065878ea86cb3186645abea2d
+  metadata.gz: be04aedd7bb95a1523e44da86185e2004fd21b2dc5fc916e814ea9deee7c4d34e9b3137e7d7c19322e69b6b5f9a715c75b480839b879af8c7456be4289bce41b
+  data.tar.gz: 535ca3d75b80953e884fd95cdb8d21cd2b36150f01981b50da64111943288626c9415e82762e81e2c557b8d2409738664d24eee910280ed21fd23af84a0b26ee

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 31.4.0
+
+- Allow URLs with fragments in Artefact#redirect_url
+
 ## 31.3.0
 
 - Include matching type-specific fields when converting editions

data/app/models/artefact.rb

@@ -401,8 +401,15 @@ class Artefact
 
   def validate_redirect_url
     return unless self.redirect_url.present?
-    unless valid_url_path?(self.redirect_url)
+    unless valid_redirect_url_path?(self.redirect_url)
       errors[:redirect_url] << "is not a valid redirect target"
     end
   end
+
+  def valid_redirect_url_path?(target)
+    URI.parse(target)
+    target.starts_with?("/") && target !~ %r{//} && target !~ %r{./\z}
+  rescue URI::InvalidURIError
+    false
+  end
 end

data/lib/govuk_content_models/version.rb

@@ -1,4 +1,4 @@
 module GovukContentModels
   # Changing this causes Jenkins to tag and release the gem into the wild
-  VERSION = "31.3.0"
+  VERSION = "31.4.0"
 end

data/test/models/artefact_test.rb

@@ -240,8 +240,24 @@ class ArtefactTest < ActiveSupport::TestCase
     artefact.redirect_url = "/foobar"
     assert artefact.valid?
 
+    artefact.redirect_url = "/foobar?an=argument"
+    assert artefact.valid?
+
+    artefact.redirect_url = "/foobar#chapter"
+    assert artefact.valid?
+
     artefact.redirect_url = "http://foo.bar/"
     refute artefact.valid?
+
+    [
+      "\jkhsdfgjkhdjskfgh//fdf#th",
+      "not a URL path",
+      "bar/baz",
+      "/foo//bar",
+    ].each do |invalid_path|
+      artefact.redirect_url = invalid_path
+      refute artefact.valid?
+    end
   end
 
   test "should translate kind into internally normalised form" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_models
 version: !ruby/object:Gem::Version
-  version: 31.3.0
+  version: 31.4.0
 platform: ruby
 authors:
 - Paul Battley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-26 00:00:00.000000000 Z
+date: 2015-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext