jekyll-secinfo 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b42c9fb47ecdc616942907528198f12fa11aef810c9faf2de279aa1966dc2f37
-  data.tar.gz: 65dc27e0c3accdc565444e94b9f9912e922e7490d24fac11abc170354dea3910
+  metadata.gz: 94058d5a6a3b7d28418354ef6409c786349617d754ced6c7e61f5e602875888e
+  data.tar.gz: 576a3f35e9d428e2e72c6e89f28ff2d08cb91ce96ba60b37cd188b6226915e11
 SHA512:
-  metadata.gz: 624d7ce5cbea3b4bb58960efa53aeb56fb10f80f1ccad37ae0ef5d35bec7fb8f9d3e6fcad6b3ece64a8447dd149143aacd9ea665a6a39c38b5e4fe40dfc16f70
-  data.tar.gz: 2b5802638bb9b581e1f5f9a06bc086f31cbe062dad18a35de1d3d22edb6422be424d57a7dd50ecba9f92e4f0c1b63a91a0328bda3c1231300f8afb9f93d352aa
+  metadata.gz: 7d8f0eb6e9afd5c2d22fb912d7a7b0c8ed300397626062022f3279b41e104a2ba306a4bf6a65b07b785c12f6914585817f434deeb97ae148c204dd29e9eb97c1
+  data.tar.gz: 34f99f5d49b8694836612b245cd764f2550f6d398b8fcf5c82cda1620e0288860049be6aed5f5550642c73e5ade92a0d613f73c3bf1a12e8c5ac16d5aebc2a5c

data/lib/jekyll-secinfo.rb

@@ -9,6 +9,7 @@ require "jekyll-secinfo/logger"
 # Core
 require "jekyll-secinfo/cve" 
 require "jekyll-secinfo/cwe" 
+require "jekyll-secinfo/divd" 
 
 module Jekyll::Secinfo
   Logger.display_info

data/lib/jekyll-secinfo/config.rb

@@ -11,8 +11,12 @@ module Jekyll::Secinfo
 		def self.get(site_config, page)
 			config = { 
 				"cve" => {},
-				"cwe" => {} 
+				"cwe" => {},
+				"divd" => {}
 			}
+
+			# CVE
+
 			if site_config && site_config.key?(CONFIG_NAME) 
 				#config["site"] = site_config[CONFIG_NAME]
 				if site_config[CONFIG_NAME].key?("cve") && site_config[CONFIG_NAME]["cve"]
@@ -23,14 +27,6 @@ module Jekyll::Secinfo
 						config["cve"]["url"] = site_config[CONFIG_NAME]["cve"]["url"]
 					end
 				end
-				if site_config[CONFIG_NAME].key?("cwe") && site_config[CONFIG_NAME]["cwe"]
-					if site_config[CONFIG_NAME]["cwe"].key?("style") && site_config[CONFIG_NAME]["cwe"]["style"]
-						config["cwe"]["style"] = site_config[CONFIG_NAME]["cwe"]["style"]
-					end
-					if site_config[CONFIG_NAME]["cwe"].key?("url") && site_config[CONFIG_NAME]["cwe"]["url"]
-						config["cwe"]["url"] = site_config[CONFIG_NAME]["cwe"]["url"]
-					end
-				end
 			end
 
 			if page.key?(CONFIG_NAME) && page[CONFIG_NAME]
@@ -44,16 +40,6 @@ module Jekyll::Secinfo
 	    				config["cve"].delete("style")
 		    		end
 		    	end
-	    		if page[CONFIG_NAME].key?("cwe") && page[CONFIG_NAME]["cwe"]
-	    			if page[CONFIG_NAME]["cwe"].key?("style") && page[CONFIG_NAME]["cwe"]["style"]
-	    				config["cwe"]["style"]=page[CONFIG_NAME]["cwe"]["style"]
-	    				config["cwe"].delete("url")
-		    		end
-	    			if page[CONFIG_NAME]["cwe"].key?("url") && page[CONFIG_NAME]["cwe"]["url"]
-	    				config["cwe"]["url"]=page[CONFIG_NAME]["cwe"]["url"]
-	    				config["cwe"].delete("style")
-		    		end
-		    	end
 			end			
 
 			if not config["cve"]["url"]  
@@ -70,6 +56,32 @@ module Jekyll::Secinfo
 				end
 			end
 
+			# CWE
+
+			if site_config && site_config.key?(CONFIG_NAME) 
+				if site_config[CONFIG_NAME].key?("cwe") && site_config[CONFIG_NAME]["cwe"]
+					if site_config[CONFIG_NAME]["cwe"].key?("style") && site_config[CONFIG_NAME]["cwe"]["style"]
+						config["cwe"]["style"] = site_config[CONFIG_NAME]["cwe"]["style"]
+					end
+					if site_config[CONFIG_NAME]["cwe"].key?("url") && site_config[CONFIG_NAME]["cwe"]["url"]
+						config["cwe"]["url"] = site_config[CONFIG_NAME]["cwe"]["url"]
+					end
+				end
+			end
+
+			if page.key?(CONFIG_NAME) && page[CONFIG_NAME]
+	    		if page[CONFIG_NAME].key?("cwe") && page[CONFIG_NAME]["cwe"]
+	    			if page[CONFIG_NAME]["cwe"].key?("style") && page[CONFIG_NAME]["cwe"]["style"]
+	    				config["cwe"]["style"]=page[CONFIG_NAME]["cwe"]["style"]
+	    				config["cwe"].delete("url")
+		    		end
+	    			if page[CONFIG_NAME]["cwe"].key?("url") && page[CONFIG_NAME]["cwe"]["url"]
+	    				config["cwe"]["url"]=page[CONFIG_NAME]["cwe"]["url"]
+	    				config["cwe"].delete("style")
+		    		end
+		    	end
+			end			
+
 			if not config["cwe"]["url"]  
 				case config["cwe"]["style"]
 				when "mitre", "nvd"
@@ -82,6 +94,35 @@ module Jekyll::Secinfo
 				end
 			end
 
+			# DIVD
+
+			if site_config && site_config.key?(CONFIG_NAME) 
+				if site_config[CONFIG_NAME].key?("divd") && site_config[CONFIG_NAME]["divd"]
+					if site_config[CONFIG_NAME]["divd"].key?("url") && site_config[CONFIG_NAME]["divd"]["url"]
+						config["divd"]["url"] = site_config[CONFIG_NAME]["divd"]["url"]
+					end
+				end
+			end
+
+			if page.key?(CONFIG_NAME) && page[CONFIG_NAME]
+	    		if page[CONFIG_NAME].key?("divd")
+	    			if page[CONFIG_NAME]["divd"]
+		    			if page[CONFIG_NAME]["divd"].key?("url")
+		    				if page[CONFIG_NAME]["divd"]["url"]
+		    					config["divd"]["url"]=page[CONFIG_NAME]["divd"]["url"]
+			    			else
+			    				config["divd"].delete("url")
+			    			end
+			    		end
+			    	else
+			    		config["divd"] = {}
+			    	end
+		    	end
+			end			
+
+			if not config["divd"]["url"]  
+				config["divd"]["url"] = "https://csirt.divd.nl/DIVD-"
+			end      
 
 			return config
 		end #get_config

data/lib/jekyll-secinfo/divd.rb

@@ -0,0 +1,64 @@
+# External
+require "jekyll"
+require "jekyll-secinfo/version"
+
+# Support
+require "jekyll-secinfo/logger" 
+require "jekyll-secinfo/config" 
+
+module Jekyll::Secinfo
+  class Divd
+    
+    def self.to_link(text, site, page)
+      #Logger.log(context)
+      config = Jekyll::Secinfo::Config.get(site, page)
+
+      m = text.match(/^(DIVD-|divd-)?(\d{4}\-\d+)/) 
+      if m
+        if config["divd"]["url"] =~ /\%s/
+          url=config["divd"]["url"] % m[2]
+        else
+          url="#{config["divd"]["url"]}#{m[2]}"
+        end
+        return "<a href='#{url}' class='divd secinfo'>DIVD-#{m[2]}</a>"
+      else
+        return nil
+      end
+    end
+  end
+
+  class DivdTag < Liquid::Tag
+
+    def initialize(tagName, text, tokens)
+      super
+      @text = text
+    end
+
+    def render(context)
+      divd_text = @text.strip
+      out = Divd.to_link(divd_text, context["site"], context["page"])
+      return out if out
+      return @text
+    end
+
+  end
+
+  module DivdFilter
+    def divd(divdtxt, niets = nil)
+      if divdtxt
+        link = Divd.to_link(divdtxt, @context.registers[:site].config, @context.registers[:page])
+        if link
+          return link
+        else
+          return divdtxt
+        end
+      else
+        return ""
+      end
+    end
+  end
+
+  Liquid::Template.register_tag("divd", Jekyll::Secinfo::DivdTag)
+  Liquid::Template.register_filter(DivdFilter)
+
+end

data/lib/jekyll-secinfo/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Secinfo
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-secinfo
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Frank Breedijk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-04 00:00:00.000000000 Z
+date: 2021-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -115,6 +115,7 @@ files:
 - lib/jekyll-secinfo/config.rb
 - lib/jekyll-secinfo/cve.rb
 - lib/jekyll-secinfo/cwe.rb
+- lib/jekyll-secinfo/divd.rb
 - lib/jekyll-secinfo/logger.rb
 - lib/jekyll-secinfo/version.rb
 homepage: https://github.com/MrSeccubus/jekyll-secinfo