libdolt 0.33.13 → 0.33.14

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTdkM2UyN2IxMGY3OGM2OTYzMDA0OGYxNzkyMDg4MGRkN2VjNjU0OA==
+    MzM5MGFmMDljMzEyY2U1Y2FmNjY5NDNmYmMwNDY2NjRhODE0MzQzZA==
   data.tar.gz: !binary |-
-    MGVkMjRmYjVmNjQwMTQwODFiYTI2MDZkNjk1MjVlNTgyYTRkNWIyMQ==
+    MjlmZjFiYzAxYTczY2RlNTVlZTQ0OTM1NzQxNTZmNzFkZGE0ZGZjNA==
 SHA512:
   metadata.gz: !binary |-
-    ZjNlYWI1NDRjMjcyZDViMjA5OTZiNDNiOWY4OTM2NDhiY2I2NjllZWUyMGU3
-    MzdjMmUwNTBhMGQzZmVlNjk2YWYyZGRmNGM3OTQ3ZWE0N2M1MjEwZmNjNjZh
-    NjNiOTk1ZmM0YjdlYWMzNzhlMjhmNGZkNmMyZWYyZTIyMmQ0NWE=
+    NDgzZTc4OGIwMjBhMzcyY2Y0NDk0NmJmZTk3NjE0OWM5MzRkNDRhYWMxYWI4
+    Mjc4MjkwMWE4Y2MwZGQ5YTZkNTRiN2I0MDc3NmMyZjQ3ZGI2ZDNmNGNlMjFj
+    Yjk2MjQwMTNkYWVhOWZmOGMyZmNhOWFlNGMyODIxNGI1MWI5OWM=
   data.tar.gz: !binary |-
-    M2QxNDc0ZDBhMWMxZGM0NjAwMDcxYTc1ODEwNTg2MTNlZDM2ODU1YzdlYTYz
-    MWQ2NjA4M2NlMjdmYzQ0M2Y4NjYzNzk5ZTBiOWY2YTFlY2U4OTU4ZDU4Nzlh
-    OWZiYWUyYmE4MGRmOWZkZjMzMDIzMTFhNGZhNzZkNTE4MzY1YWM=
+    NjBmYmRiOWRkZjAxMjBjNzYyZGIxNjg5NThiNmQyOWQzNzFlOGExYjViNTRk
+    MzhmYjNiZWE3YjVjNjU3ZDcwMjdmZWY5NTlhYmI3YjkzMDI5ZTc5ZGQ1Mjkz
+    NDM1NmQxNzFjMTU4NGQxN2FlOWJlMmQ1OTQxNzhhMmE0MmNiMWI=

data/.gitignore

@@ -1,4 +1,5 @@
-coverage
-test/reports
 /Gemfile.lock
+coverage
 pkg
+tags
+test/reports

data/lib/libdolt/git/commit.rb

@@ -45,7 +45,9 @@ module Dolt
         case key
         when :author
           pieces = value.match(/(.*)\s<(.*)>/)
-          value = { :name => pieces[1], :email => pieces[2] }
+          name = HTMLEscape.entityfy(pieces[1])
+          email = HTMLEscape.entityfy(pieces[2])
+          value = { :name => name, :email => email }
         when :date
           value = Time.parse(value)
         end
@@ -56,7 +58,8 @@ module Dolt
       def self.extract_commit_summary(lines)
         summary = lines.shift
         lines.shift if lines.first == ""
-        summary.sub(/^    /, "")
+        summary = summary.sub(/^    /, "")
+        HTMLEscape.entityfy(summary)
       end
 
       def self.extract_commit_message(lines)
@@ -66,7 +69,7 @@ module Dolt
           message << lines.shift
         end
 
-        message
+        HTMLEscape.entityfy(message)
       end
     end
   end

data/lib/libdolt/html_escape.rb

@@ -0,0 +1,27 @@
+# encoding: utf-8
+#--
+#   Copyright (C) 2014 Gitorious AS
+#
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU Affero General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   This program 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 Affero General Public License for more details.
+#
+#   You should have received a copy of the GNU Affero General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#++
+require "htmlentities"
+
+module Dolt
+  module HTMLEscape
+    def self.entityfy(content)
+      @coder ||= HTMLEntities.new
+      @coder.encode(content)
+    end
+  end
+end

data/lib/libdolt/version.rb

@@ -17,5 +17,5 @@
 #++
 
 module Dolt
-  VERSION = "0.33.13"
+  VERSION = "0.33.14"
 end

data/lib/libdolt/view/blob.rb

@@ -24,11 +24,6 @@ module Dolt
         !content[0...(content.length-1)].index("\000").nil?
       end
 
-      def entityfy(content)
-        @coder ||= HTMLEntities.new
-        @coder.encode(content)
-      end
-
       def format_blob(path, content, repo = nil, ref = nil)
         return format_binary_blob(path, content, repo, ref) if binary?(content)
         format_text_blob(path, content, repo, ref)
@@ -48,7 +43,7 @@ The content you're attempting to browse appears to be binary.
       end
 
       def format_text_blob(path, content, repository = nil, ref = nil)
-        multiline(entityfy(content))
+        multiline(HTMLEscape.entityfy(content))
       end
 
       def format_whitespace(text)

data/lib/libdolt.rb

@@ -19,6 +19,7 @@ require "libdolt/version"
 require "libdolt/disk_repo_resolver"
 require "libdolt/repository_lookup"
 require "libdolt/controller_actions"
+require "libdolt/html_escape"
 require "libdolt/view"
 require "force_utf8/encode"
 

data/test/fixtures/dolt-test-repo.git/info/refs

@@ -0,0 +1,2 @@
+52d7029425ff0556ff659e570f71393b6c28ac9c	refs/heads/master
+fc5f5fb50b435e183925b341909610aace90a413	refs/tags/testable-tag

data/test/fixtures/dolt-test-repo.git/objects/19/6e6f2a91c6ab8c7fc2f3cd5124cedb1a2fc83a

@@ -0,0 +1,3 @@
+x
E��N�0EY�+Fݰ@j�J\K!B,���ƓqǑ���S(��ѹJ1h���!գ��8V�6��Z)RLMm�'����f�<-@�&�5��h�� �[:�Z������%exI	�1C[(�%��.��1����Ё�G�g
+Q��Ņ3��G8
+n�'�5F���۴BW�oE.�\}
�b�

data/test/fixtures/dolt-test-repo.git/objects/info/packs

@@ -0,0 +1,2 @@
+P pack-a50f04f936dd57b638b5b97a5eeaf8860c97ae2e.pack
+

data/test/fixtures/dolt-test-repo.git/packed-refs

@@ -0,0 +1,3 @@
+# pack-refs with: peeled fully-peeled 
+52d7029425ff0556ff659e570f71393b6c28ac9c refs/heads/master
+fc5f5fb50b435e183925b341909610aace90a413 refs/tags/testable-tag

data/test/libdolt/git/repository_test.rb

@@ -163,6 +163,27 @@ describe Dolt::Git::Repository do
         }]
       assert_equal expected, log
     end
+
+    it "escapes summary and message" do
+      log = @repository.tree_history("52d702", "")
+
+      expected = {
+          :type => :blob,
+          :oid =>  "e2bd58a7c13c12a39fe882b773e00b66438a9451",
+          :filemode => 33188,
+          :name => "README.org",
+          :history => [{
+              :oid => "52d7029425ff0556ff659e570f71393b6c28ac9c",
+              :author => { :name => "Foo O'Bar",
+                :email => 'script src="foobar.js"/' },
+              :summary => "I'm an <script>unsafe</script> summary",
+              :date => Time.parse("2014-01-09 13:16:03 +0200"),
+              :message => "        I'm a <script>scary</script> message"
+            }]
+        }
+
+      assert_equal expected, log[1]
+    end
   end
 
   describe "#readmes" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libdolt
 version: !ruby/object:Gem::Version
-  version: 0.33.13
+  version: 0.33.14
 platform: ruby
 authors:
 - Christian Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-02 00:00:00.000000000 Z
+date: 2014-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
@@ -201,6 +201,7 @@ files:
 - lib/libdolt/git/repository.rb
 - lib/libdolt/git/submodule.rb
 - lib/libdolt/git/tree.rb
+- lib/libdolt/html_escape.rb
 - lib/libdolt/repository_lookup.rb
 - lib/libdolt/version.rb
 - lib/libdolt/view.rb
@@ -226,48 +227,27 @@ files:
 - test/fixtures/dolt-test-repo.git/config
 - test/fixtures/dolt-test-repo.git/description
 - test/fixtures/dolt-test-repo.git/info/exclude
-- test/fixtures/dolt-test-repo.git/objects/03/0bc1fa37aac317a5d38fbb4f3a6d22b34c6eba
+- test/fixtures/dolt-test-repo.git/info/refs
 - test/fixtures/dolt-test-repo.git/objects/04/76d88d4c60823927c52f872ff09e7f84fb3549
-- test/fixtures/dolt-test-repo.git/objects/07/4e4c198421bfc8a1bf9a9c0fc117c4569ba0bd
-- test/fixtures/dolt-test-repo.git/objects/12/67a0fbd3ec606c20f3f1dca1f53bb9505ba9b5
-- test/fixtures/dolt-test-repo.git/objects/13/0ddb17c01e1c283669d012ad9e7e92fa1af5b1
 - test/fixtures/dolt-test-repo.git/objects/19/344f9121eb8871e814efd9534de9a0891631da
+- test/fixtures/dolt-test-repo.git/objects/19/6e6f2a91c6ab8c7fc2f3cd5124cedb1a2fc83a
 - test/fixtures/dolt-test-repo.git/objects/19/a9bccbaadfa2e25f74584c3f13caebd600d23f
-- test/fixtures/dolt-test-repo.git/objects/1a/f9b62325e53f0e9aff8ed80d919b73a6fd18e2
 - test/fixtures/dolt-test-repo.git/objects/1e/cafd67fb977dee90345f0503b0ecc2e62e01d1
 - test/fixtures/dolt-test-repo.git/objects/1f/5508d7182176fa7584096d24d3b5f288a101ab
-- test/fixtures/dolt-test-repo.git/objects/26/4c348a80906538018616fa16fc35d04bdf38b0
-- test/fixtures/dolt-test-repo.git/objects/28/5f85e1dae8796d8780106b3986ba47cf989bca
 - test/fixtures/dolt-test-repo.git/objects/2b/f4bb63d412e8f5730c0fe6da5c6e5e913f26fa
-- test/fixtures/dolt-test-repo.git/objects/36/855d2d2899aa1044c4ea8eba229d7460cc083a
-- test/fixtures/dolt-test-repo.git/objects/38/3216e07edec271936c7fd87b69c346511aedb2
 - test/fixtures/dolt-test-repo.git/objects/3d/2cf127812ba38c74a69ea9f691768d68769df4
 - test/fixtures/dolt-test-repo.git/objects/4f/3b300a2d261163a8b0753aacdd378e3b73b917
 - test/fixtures/dolt-test-repo.git/objects/55/b0879bb70392b5754af3fe2b9ca2b98d22f3fb
-- test/fixtures/dolt-test-repo.git/objects/60/eebb9021a6ce7d582c2f2d4aa5bfb3672150ae
-- test/fixtures/dolt-test-repo.git/objects/64/bb41b95d4f696fc9e22ef9718fc2eaf0b6ccac
 - test/fixtures/dolt-test-repo.git/objects/75/937fa642851b518ccab55f7880d02e854e67f7
-- test/fixtures/dolt-test-repo.git/objects/85/026eda8302b98fa54cc24445a118028865a2e2
-- test/fixtures/dolt-test-repo.git/objects/89/cd7e9d4564928de6b803b36c6e3d081c8d9ca1
 - test/fixtures/dolt-test-repo.git/objects/96/68141a1c781cf4ec352cca52d0cebf8a04fc50
-- test/fixtures/dolt-test-repo.git/objects/a1/2abf5b47584c947cc7f09b27e5895644c5524d
-- test/fixtures/dolt-test-repo.git/objects/b4/0c249db94476cac7fa91a9d6491c0faf21ec21
-- test/fixtures/dolt-test-repo.git/objects/c0/35ba24bb3bed31589bc6736ca9b116175eb723
-- test/fixtures/dolt-test-repo.git/objects/c8/cc83f1a1fc3640fce14ab73d4fa4b22b6211d8
-- test/fixtures/dolt-test-repo.git/objects/ca/d2309100006f94967cdafe678356b96bb098a5
-- test/fixtures/dolt-test-repo.git/objects/cd/104f8b749c206e7faef1cb7c03f453cbb1aa57
-- test/fixtures/dolt-test-repo.git/objects/cd/888aef50e3742885630ea4aa8c05f12b5518f4
-- test/fixtures/dolt-test-repo.git/objects/d1/f94fb68cf34f7f121a949e89e09d1a8c1b3825
 - test/fixtures/dolt-test-repo.git/objects/da/dd1e7ec0c822ba96fcee5d064bea66a7be3d5a
-- test/fixtures/dolt-test-repo.git/objects/de/dbf2faa4f522716ab727e4325a3d75772e137b
 - test/fixtures/dolt-test-repo.git/objects/df/d46204a2c44405a2591c2dbc7e73d1a81b5334
 - test/fixtures/dolt-test-repo.git/objects/e5/d842ae3035a402d34b531ae5117bc03b50ac77
 - test/fixtures/dolt-test-repo.git/objects/e7/271e0e558b55397698b8c73acf13bd7429ebb3
-- test/fixtures/dolt-test-repo.git/objects/e8/d33ae69b8c4d3df1e8fad4733d69720b176849
-- test/fixtures/dolt-test-repo.git/objects/e9/0021f89616ddf86855d05337c188408d3b417e
-- test/fixtures/dolt-test-repo.git/objects/fc/5f5fb50b435e183925b341909610aace90a413
-- test/fixtures/dolt-test-repo.git/refs/heads/master
-- test/fixtures/dolt-test-repo.git/refs/tags/testable-tag
+- test/fixtures/dolt-test-repo.git/objects/info/packs
+- test/fixtures/dolt-test-repo.git/objects/pack/pack-a50f04f936dd57b638b5b97a5eeaf8860c97ae2e.idx
+- test/fixtures/dolt-test-repo.git/objects/pack/pack-a50f04f936dd57b638b5b97a5eeaf8860c97ae2e.pack
+- test/fixtures/dolt-test-repo.git/packed-refs
 - test/libdolt/controller_actions_test.rb
 - test/libdolt/disk_repo_resolver_test.rb
 - test/libdolt/git/archiver_test.rb

data/test/fixtures/dolt-test-repo.git/objects/38/3216e07edec271936c7fd87b69c346511aedb2

@@ -1,2 +0,0 @@
-x
��Aj�0@Ѯu��ʌlK���]n1���X.���Bz�l���e�����G[U�:L)�$%�c�\HH�SP��f&�C$�˫�������g\���j��,V9ct",��ڴ�p�ֲ��N��u�
-;����_�U��Nj���>�"y�6}3c)A�W���m���c���S�

data/test/fixtures/dolt-test-repo.git/objects/60/eebb9021a6ce7d582c2f2d4aa5bfb3672150ae

@@ -1,2 +0,0 @@
-x
��AJ�0�a�9����$}	<Dq�-&�	��D�����	�~��_Ǿo|H�0M��	5�%`S� ��54	���x��ܗ�'4�-���F����e���ZF	�N�����c;�&��*��w����ŧ>���F�S������N�gƽ�
-�U�Q�Os߄P�

data/test/fixtures/dolt-test-repo.git/objects/64/bb41b95d4f696fc9e22ef9718fc2eaf0b6ccac

@@ -1,2 +0,0 @@
-x
��A
-�0@Q�9��I�I&
ŝ�H&SZ���q����}���y��i�H�I�w���L��ِ��Gd��H����I|́���w�T��->�ѹ#0��lü�yXƵ���eR]�žv��wu>@g������h��3��ό:��k�����7��P

data/test/fixtures/dolt-test-repo.git/objects/e8/d33ae69b8c4d3df1e8fad4733d69720b176849

@@ -1 +0,0 @@
-x
���J1�a�}��$MMg�&x�

data/test/fixtures/dolt-test-repo.git/refs/heads/master

@@ -1 +0,0 @@
-cd104f8b749c206e7faef1cb7c03f453cbb1aa57

data/test/fixtures/dolt-test-repo.git/refs/tags/testable-tag

@@ -1 +0,0 @@
-fc5f5fb50b435e183925b341909610aace90a413