no-style-please2-plugins 0.7.4 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f70756daa935247238f2e2b403c75554db41b447acbaa0339be4e882478bb20
-  data.tar.gz: ab75d02a6103b328403d6b65bebafcfc564345f1f2341476e3e89a83a0a49c15
+  metadata.gz: eb824516aa69202aeb751b710764aea4f7c8e352bfcf94fe7ee426c66f354a45
+  data.tar.gz: dd951357fe4e823aa00456d13814ae8815fbf40026318b0e132554564a28dbfd
 SHA512:
-  metadata.gz: 6ec817b045439f0512850cc77c0a418d785d0f0ed2fbe9f9c5d28b4fbda203fabd997a287a70ceb5be3ff91893348984170d8a6dd760ee369d9f7c744605c575
-  data.tar.gz: a8acf8fd6d2176818d420e8f7f41c8e349215da10696ab5af751b3cbd126562bd1655174a5d2c128a35b394d6c9998034a5a9bf6dfd19d04c6cc6b3ade645d0f
+  metadata.gz: d5ffba3bbbe75ba9dcfb62e15d01ce34ac76ec3d3dcdd554f4244dc93093575c4fbb93e3a67859b00e2ceee476baff27d911fefdf4aedff851d63042287cf3e2
+  data.tar.gz: 58266e9e6dfd9767022640fdc5bad66a5876537e4dcb49c744fff3a09180fba54b02d71a4807841d747f761b75166097da4b83437c19da9fb529592464ca22f3

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/version/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NoStylePlease2
-  VERSION = "0.7.4"
+  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.4
+  version: 0.8.0
 platform: ruby
 authors:
 - vitock
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-12-31 00:00:00.000000000 Z
+date: 2025-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll