no-style-please2-plugins 0.7.3 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab334d2c482d4209e3ba73781eacd5f3b0f5e1735500d879de12555f9e156df3
-  data.tar.gz: 23eb54db2441640193bde976518f504630651305581d21d2e66eaa9008220e67
+  metadata.gz: eb824516aa69202aeb751b710764aea4f7c8e352bfcf94fe7ee426c66f354a45
+  data.tar.gz: dd951357fe4e823aa00456d13814ae8815fbf40026318b0e132554564a28dbfd
 SHA512:
-  metadata.gz: d0fc8b380faf95c98d75ca79360e9a9ddd472900a30ff9eb8e92408ed33e89a51a56dbfd542daac121d326f97bc75c5f5f68f8f21e97ff1fa436f5e058998d3b
-  data.tar.gz: ec8a98db075fb514a7a515e56c3c5f02193b49a9ebf8cad63af566d0e80ef604c98633aded8063bba993ffe23e3e1f448000df5f732ad8f749ea15618cf368a0
+  metadata.gz: d5ffba3bbbe75ba9dcfb62e15d01ce34ac76ec3d3dcdd554f4244dc93093575c4fbb93e3a67859b00e2ceee476baff27d911fefdf4aedff851d63042287cf3e2
+  data.tar.gz: 58266e9e6dfd9767022640fdc5bad66a5876537e4dcb49c744fff3a09180fba54b02d71a4807841d747f761b75166097da4b83437c19da9fb529592464ca22f3

data/Gemfile.lock

@@ -1,87 +1,89 @@
 PATH
   remote: .
   specs:
-    no-style-please2-plugins (0.4.0)
+    no-style-please2-plugins (0.7.4)
       digest
-      jekyll (~> 4.2.0)
+      jekyll (~> 4.0)
       ltec (~> 0.1.2)
-      salsa20 (~> 0.1.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    base64 (0.1.1)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    base64 (0.1.2)
+    bigdecimal (3.1.8)
     colorator (1.1.0)
-    concurrent-ruby (1.1.10)
-    digest (3.1.0)
+    concurrent-ruby (1.3.4)
+    digest (3.1.1)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
     eventmachine (1.2.7)
-    ffi (1.15.5)
+    ffi (1.17.0-arm64-darwin)
     forwardable-extended (2.6.0)
+    google-protobuf (4.29.1-arm64-darwin)
+      bigdecimal
+      rake (>= 13)
     http_parser.rb (0.8.0)
-    i18n (1.10.0)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
-    ipaddr (1.2.4)
-    jekyll (4.2.2)
+    jekyll (4.3.4)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
       i18n (~> 1.0)
-      jekyll-sass-converter (~> 2.0)
+      jekyll-sass-converter (>= 2.0, < 4.0)
       jekyll-watch (~> 2.0)
-      kramdown (~> 2.3)
+      kramdown (~> 2.3, >= 2.3.1)
       kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
-      mercenary (~> 0.4.0)
+      mercenary (>= 0.3.6, < 0.5)
       pathutil (~> 0.9)
-      rouge (~> 3.0)
+      rouge (>= 3.0, < 5.0)
       safe_yaml (~> 1.0)
-      terminal-table (~> 2.0)
-    jekyll-sass-converter (2.2.0)
-      sassc (> 2.0.1, < 3.0)
+      terminal-table (>= 1.8, < 4.0)
+      webrick (~> 1.7)
+    jekyll-sass-converter (3.0.0)
+      sass-embedded (~> 1.54)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    kramdown (2.4.0)
-      rexml
+    kramdown (2.5.1)
+      rexml (>= 3.3.9)
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    liquid (4.0.3)
-    listen (3.7.1)
+    liquid (4.0.4)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    ltec (0.1.2.1)
+    ltec (0.1.3.1)
       base64 (~> 0.1.0)
-      openssl (~> 2.2.0)
+      openssl
     mercenary (0.4.0)
-    openssl (2.2.1)
-      ipaddr
+    openssl (3.3.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (4.0.7)
-    rake (13.0.6)
-    rb-fsevent (0.11.1)
-    rb-inotify (0.10.1)
+    public_suffix (6.0.1)
+    rake (13.2.1)
+    rb-fsevent (0.11.2)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rexml (3.2.5)
-    rouge (3.28.0)
+    rexml (3.4.0)
+    rouge (4.5.1)
     safe_yaml (1.0.5)
-    salsa20 (0.1.3)
-    sassc (2.4.0)
-      ffi (~> 1.9)
-    terminal-table (2.0.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    unicode-display_width (1.8.0)
+    sass-embedded (1.82.0-arm64-darwin)
+      google-protobuf (~> 4.28)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    unicode-display_width (2.6.0)
+    webrick (1.9.1)
 
 PLATFORMS
-  x86_64-darwin-20
+  arm64-darwin
 
 DEPENDENCIES
   no-style-please2-plugins!
   rake (~> 13.0)
 
 BUNDLED WITH
-   2.3.13
+   2.5.23

data/README.md

@@ -21,7 +21,7 @@ If bundler is not being used to manage dependencies, install the gem by executin
 
 ## Usage
 
-see this [demo](https://vitock.ink/no-style-please-demo/)
+see this [demo](https://vitock.github.io/no-style-please/)
 
 ## Development
 

data/lib/enc.rb

@@ -5,9 +5,46 @@ require 'ltec'
 require "jekyll"
 require "fileutils"
 module Jekyll
-  def test
-  end
+  
+  
+
   class EncFilterTool
+    def EncFilterTool.getAllKey(page)
+      site = Jekyll::sites[0]
+      keys = []
+      key = "#{page['key']}"
+      if key != nil && key.length > 0
+        keys << key
+      end
+
+     posttags = page["tags"]
+     enctags = site.config['enc_tags']
+     if posttags && posttags.length > 0 && enctags
+       
+       for tag in posttags
+         for enctag in enctags
+           if enctag['tag'] == tag 
+             key = "#{enctag['password']}"
+             keys << key
+           end
+         end
+       end 
+     end
+     keys.map do |key| 
+      if key.length > 50
+        pubkey = ENV["JEKYLL_EC_PRIVATEKEY"]
+        if pubkey == nil 
+          raise 'JEKYLL_EC_PRIVATEKEY not set on envionment'
+        end 
+        key = Ltec::EC.decrypt(pubkey,key)
+
+        if key == nil  || key.length == 0 
+          raise "key decription fail"
+        end
+      end
+      key
+     end
+    end
     def EncFilterTool.getKey(content,page)
       site = Jekyll::sites[0]
       key = "#{page['key']}"
@@ -59,7 +96,15 @@ module Jekyll
   end
   module EncFilter
 
+
     $KeyMap = {}
+    def bin2hex(str)
+      str.unpack('C*').map{ |b| "%02x" % b }.join('')
+    end
+  
+    def hex2bin(str)
+      [str].pack "H*"
+    end
     def genKey(password)
       cacheKey = $KeyMap[password]
       if cacheKey
@@ -80,7 +125,7 @@ module Jekyll
       cipher.iv = iv
       cipher.key = genKey password
       encrypted = cipher.update(msg) + cipher.final
-      return  'E1.' + Base64.strict_encode64(iv  + encrypted + cipher.auth_tag)
+      return  'E2.' + Base64.strict_encode64(iv  + encrypted + cipher.auth_tag)
       
     end 
     def get_encrypt_id(content,page)
@@ -92,7 +137,6 @@ module Jekyll
         return ""
       end 
     end
-
     def  encrypt_content(content,page,prefix)
       psw = EncFilterTool.getKey(content,page)
       psw = prefix + psw + prefix
@@ -123,6 +167,35 @@ module Jekyll
       return ''
     end
 
+    def rand_bytes(_,n2)
+      return bin2hex(OpenSSL::Random.random_bytes(n2))
+    end
+
+    def encrypt_content_v2(content,pswHex)
+      if !pswHex || pswHex.length != 64
+        raise "invalid Key:" + pswHex
+      end
+      cipher = OpenSSL::Cipher::AES.new(256, :CBC).encrypt
+      iv = cipher.random_iv
+      cipher.iv = iv
+      cipher.key = hex2bin(pswHex)
+      encrypted = cipher.update(content) + cipher.final
+      return  'E2.' + Base64.strict_encode64(iv  + encrypted )
+    end
+
+
+    def encrypt_key(x,page,keyHex2Enc,encid)
+      arr = EncFilterTool.getAllKey(page)
+      newArr = arr.map do |k| 
+        key = genKey  encid + k + encid
+        hexKey = bin2hex key
+        encrypt_content_v2(hex2bin(keyHex2Enc),hexKey)
+      end
+
+      newArr.join('#')  
+    end
+    
+
     
   end
 
@@ -131,14 +204,6 @@ Liquid::Template.register_filter(Jekyll::EncFilter)
 
 
 
-def bin2hex(str)
-  str.unpack('C*').map{ |b| "%02x" % b }.join('')
-end
-
-def hex2bin(str)
-  [str].pack "H*"
-end
-
 
 
 end

data/lib/ext.rb

@@ -123,6 +123,28 @@ module Jekyll
       end
     end
 
+    class IncludeFile < Liquid::Tag
+  
+      def initialize(tag_name, text, tokens)
+        rootPath0 = $g_config['include_file_path'] || 'assets'
+        filePath0 = "#{rootPath0}/#{text}".strip!()
+        begin
+          file = File.open(filePath0)
+          @filecontent = file.read()
+        rescue => exception
+          puts exception
+          @filecontent = "load file:#{text} failed"
+          
+        end
+       
+      end
+    
+      def render(context)
+        return @filecontent
+      end
+    end
+
+    
     
     class IncludeCode < Liquid::Tag
       @filecontent = ""
@@ -161,6 +183,7 @@ EOF
   Liquid::Template.register_tag('include_code', Jekyll::IncludeCode)
   Liquid::Template.register_tag('post_link', Jekyll::PostLink)
   Liquid::Template.register_tag('img_link', Jekyll::ImgLink)
+  Liquid::Template.register_tag('include_file', Jekyll::IncludeFile)
 
   
   

data/lib/version/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NoStylePlease2
-  VERSION = "0.7.3"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: no-style-please2-plugins
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.0
 platform: ruby
 authors:
 - vitock
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-11-23 00:00:00.000000000 Z
+date: 2025-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll