jekyll-csp 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad7855278a3b719aaaa04add26777010e47ee2c9b25cd736b20e3fde75538e72
-  data.tar.gz: 13323d6f7ee84b5ef4f0a0d6e65ae5324664667fe890c2016bd3884972f0c212
+  metadata.gz: 87bf794c740e33e1683dc6bd37e54d0fac6dc44342f8af9d03938e5a39ead8dd
+  data.tar.gz: e5ed9bd0bc9136eada039e26fa184332c9c281b5251f0bfd6beb6e971d20b45a
 SHA512:
-  metadata.gz: f4182dbcae069d047c16216eef429c151adb6bdeda1cc7405773ff5bf5ca7c4a8c69e6667f981757b9dae8bdcbe51c844499d818d0c7452c4ea53783f7a4029e
-  data.tar.gz: e0da23509ad6205c73d0e6d47c5521b851aefe8696c6711ce4debeef8480e8cbe0247f8f5df8aea6fc89fe08404965cc8acd04df4b0c7bbb3d4fc9872eb929e7
+  metadata.gz: e66bfa97a218e35b098509ece896d2f35d55af23b35cef1f14660e9c07cf26bc6cf5ddda9ffabfabaabadcf791a858dbaf6aab1c0bc236c82e12812aae488a90
+  data.tar.gz: 70bf27b010d71e5dc876744f3577b627561ea3231b039390abd10ff0bc72c084cf399a830b1129d3050147f22fc15152b7832f5538c10c5d7cb0146c38ff4208

data/lib/jekyll-csp/csp.rb

@@ -28,7 +28,7 @@ module CSP
       @indentation = config['indentation'] || 2
       @enable_newlines = config['newlines'].to_s ? config['newlines'] : true
       @debug = config['debug'].to_s ? config['debug'] : false
-      @include_self = config['include_self'].to_s ? config['include_self'] : false
+      @inject_self = config['inject_self'] || ['script-src', 'style-src', 'img-src', 'frame-src']
 
       if @enable_newlines == false
         @indentation = 0
@@ -37,7 +37,6 @@ module CSP
       self.write_debug_log(config)
     end
 
-
     ##
     # Write a debug log
     def write_debug_log(content)
@@ -55,8 +54,12 @@ module CSP
       # Line separator
       line_sep = @enable_newlines ? "\n" : ""
 
+      if items.empty?
+        return "" << line_sep  << self.get_indent_str(3) << tag << ';'
+      end
+
       "" \
-      << line_sep \
+      << line_sep  \
       << self.get_indent_str(3) \
       << tag \
       << " " \
@@ -85,6 +88,7 @@ module CSP
       csp['content'] = meta_content
     end
 
+    ## Locate an existing CSP or create one
     def get_or_create_csp_tag
       csp = @nokogiri.at_xpath("//meta[translate(@http-equiv, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz') = 'content-security-policy']")
 
@@ -119,20 +123,24 @@ module CSP
         policies = content.split(';')
         
         policies.each do |policy|
-          policy = policy.strip! || policy
+          policy = policy.strip
+          
+           policy_tag = policy
+           policy_items = []
 
           if policy.include? ' '
             policy_parts = policy.split(' ')
+            policy_tag = policy_parts[0]
+            policy_items = policy_parts.drop(1)
+          end
 
-            self.write_debug_log("Found existing CSP meta tag for '" << policy_parts[0] << "', concatenating rather than creating.")
-            
-            # If an existing tag doesn't exist, add it assuming the user knows best
-            if !@csp_tags.key?(policy_parts[0])
-              @csp_tags[policy_parts[0]] = []
-            end
-            
-            @csp_tags[policy_parts[0]].concat(policy_parts.drop(1))
+          # If an existing tag doesn't exist, add it
+          if !@csp_tags.key?(policy_tag)
+            @csp_tags[policy_tag] = []
           end
+          
+          # Concat the tag items
+          @csp_tags[policy_tag].concat(policy_items)
         end
 
         @nokogiri.search('meta[http-equiv="Content-Security-Policy"]').each do |el|
@@ -144,12 +152,10 @@ module CSP
     ##
     # Initialize some default values
     def inject_defaults
-      if @include_self == false
-        return 
-      end
-
-      @csp_tags.each do |tag, items|
-        items.push("'self'")
+      @csp_tags.each do |directive, properties|
+        if @inject_self.include? directive
+          properties.push("'self'")
+        end
       end
     end
 

data/lib/jekyll-csp/version.rb

@@ -1,3 +1,3 @@
 module JekyllCSP
-  VERSION = "1.0.0".freeze
+  VERSION = "1.1.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-csp
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - scottstraughan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-12 00:00:00.000000000 Z
+date: 2025-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll