no-style-please2-plugins 0.7.4 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f70756daa935247238f2e2b403c75554db41b447acbaa0339be4e882478bb20
-  data.tar.gz: ab75d02a6103b328403d6b65bebafcfc564345f1f2341476e3e89a83a0a49c15
+  metadata.gz: 1481f05da7257deb43b4f2d8475d8e708e4bb3d4c31f23ca3f20580ee6ac60cf
+  data.tar.gz: df0238ad5567dc1ce3bb8e242b2258accf3ff65f752c007522dd1dea22f0f75f
 SHA512:
-  metadata.gz: 6ec817b045439f0512850cc77c0a418d785d0f0ed2fbe9f9c5d28b4fbda203fabd997a287a70ceb5be3ff91893348984170d8a6dd760ee369d9f7c744605c575
-  data.tar.gz: a8acf8fd6d2176818d420e8f7f41c8e349215da10696ab5af751b3cbd126562bd1655174a5d2c128a35b394d6c9998034a5a9bf6dfd19d04c6cc6b3ade645d0f
+  metadata.gz: 3a655d2b12c8c5ccfaedeeebb186b5c41438861c293d2fa3a89dd173e72f6945cf2af2767e8a3be4df5b0cd4ca9ed221559b6c046b7a9720a3bfdf1925b752f6
+  data.tar.gz: cec5db851784412d946b307f55fb374efdaade832752d96dff3027c59298989f9cf0e1e27a1a9e7c0b8130038511669cd09d8abfc98f849e85eec87ec8ac5154

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    no-style-please2-plugins (0.7.4)
+    no-style-please2-plugins (0.9.0)
       digest
       jekyll (~> 4.0)
       ltec (~> 0.1.2)

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']}"
@@ -57,9 +94,22 @@ module Jekyll
       return   "#{key}"
     end
   end
+  # 大端模式
+  def self.nmberToBinary4(num)
+    [num].pack("N")[0, 4]
+  end
+
   module EncFilter
 
+
     $KeyMap = {}
+    def bin2hex(str)
+      str.unpack('C*').map{ |b| "%02x" % b }.join('')
+    end
+  
+    def self.hex2bin(str)
+      [str].pack "H*"
+    end
     def genKey(password)
       cacheKey = $KeyMap[password]
       if cacheKey
@@ -80,7 +130,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 +142,6 @@ module Jekyll
         return ""
       end 
     end
-
     def  encrypt_content(content,page,prefix)
       psw = EncFilterTool.getKey(content,page)
       psw = prefix + psw + prefix
@@ -123,20 +172,52 @@ module Jekyll
       return ''
     end
 
+    def rand_bytes(_,n2)
+      return bin2hex(OpenSSL::Random.random_bytes(n2))
+    end
+
     
-  end
+    def encrypt_content_v2(content,pswHex)
+      if !pswHex || pswHex.length != 64
+        raise "invalid Key:" + pswHex
+      end
+      cipher = OpenSSL::Cipher::AES.new(256, :CTR).encrypt
+      iv = cipher.random_iv
+      cipher.iv = iv
+      cipher.key = EncFilter.hex2bin(pswHex)
+      encrypted = cipher.update(content) + cipher.final
 
+      
+      len = 4 +  iv.length + encrypted.length
+      lenBf = Jekyll.nmberToBinary4(len)
+      lenBf2 = lenBf.bytes.map.each_with_index do |v,i|
+        z = i ^ iv.bytes[i ]
+        v ^ z
+      end.pack('C*')
+      return   Base64.strict_encode64(lenBf2 + iv  + encrypted )
+    end
 
-Liquid::Template.register_filter(Jekyll::EncFilter)
+    def encrypt_key(x,page,keyHex2Enc,encid)
+      arr = EncFilterTool.getAllKey(page)
+      newArr = arr.map do |k| 
+        key = genKey  encid + k + encid
+        hexKey = bin2hex key
+        Base64.strict_decode64(encrypt_content_v2(EncFilter.hex2bin(keyHex2Enc),hexKey))
+      end
 
+      Base64.strict_encode64(newArr.join)
 
+    end
+ 
 
-def bin2hex(str)
-  str.unpack('C*').map{ |b| "%02x" % b }.join('')
-end
+    
+  end
+
+
+Liquid::Template.register_filter(Jekyll::EncFilter)
 
-def hex2bin(str)
-  [str].pack "H*"
+class Test
+  extend EncFilter
 end
 
 

data/lib/version/version.rb

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

data/test.rb

@@ -2,6 +2,7 @@
 
 require 'openssl'
 require 'base64'
+require_relative "lib/enc"
 $Key = {}
 def genKey(password)
     cache = $Key[password]
@@ -51,6 +52,8 @@ def decrypt(enstring,password)
 end 
 
 
+
+
 msg = '我的 12a23007'
 z = encrypt msg,'123'
 puts z 
@@ -64,4 +67,13 @@ genKey '123'
 genKey '123'
 genKey '123'
 genKey '456'
-puts $Key
+ 
+puts '---'
+a = Jekyll::nmberToBinary4(256)
+puts a.unpack1('H*')
+a = a.bytes.map.each_with_index do |byte,i | byte ^ i 
+end.pack('C*')
+ 
+puts a.unpack1('H*') 
+
+puts Jekyll::Test.encrypt_content_v2('333333a','00000000000000052f5c9b07ebc4464717978b174c440573df03e2962d98946c')

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.9.0
 platform: ruby
 authors:
 - vitock
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-12-31 00:00:00.000000000 Z
+date: 2025-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll