no-style-please2-plugins 0.4.3 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9f4f4a41d85064307365636096162753cb141b2832a40825c7aa90f38ee399c
-  data.tar.gz: 87a751e6931d4a02d7c995eb026f8b8d2a9f81a532a842a7ddbfa1ca4ca4a73a
+  metadata.gz: 59d293c063433293db2fed307b79dcb273375902063bf528a3abd8264fbc926c
+  data.tar.gz: f24ca36b1f368811a257411184cd26837e7ed0126128859c3f64be663cebfcb5
 SHA512:
-  metadata.gz: d373db5377ec0dc015cab2fb94cfd14d2695e970089a062bc73741f9e2119cb40e55b465071b68713fc50047b471ba0857509822ed15e4f3337bb60f35190b38
-  data.tar.gz: 944d77a182c0644d635d89e0e8ab083a4a3a72b54b80e32aa711ea08fe7f805a09a6ff4bf14e74c0de8753f783cef7cf0dd123ae28b4526a98773b76195951a3
+  metadata.gz: e83ac543cf0985152d69e143a3dce55626c54588620c076b2435f7e9be321b49f86af338f1968fc02283cfac75ffc6bb3b2ea3783860cc6a9e25ca0032d89e68
+  data.tar.gz: 8b6ba41e812b9e6b2d318606968c8cfbc549eb1fbcc890c9dd61a2a8a77ab9de374d5ccfd9bc68272843cfb60f5d1dcbc7f4ad56b31ff69d3b942ae976e99b2c

data/gem.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "jekyll", "~>4.0"
   spec.add_dependency "ltec", "~> 0.1.2"
-  spec.add_dependency "salsa20", "~> 0.1.3"
+  # spec.add_dependency "salsa20", "~> 0.1.3"
   spec.add_dependency "digest"
   # Uncomment to register a new dependency of your gem
   # spec.add_dependency "example-gem", "~> 1.0"

data/lib/enc.rb

@@ -1,6 +1,5 @@
 require 'openssl'
 require 'base64'
-require 'salsa20'
 require 'digest'
 require 'ltec'
 require "jekyll"
@@ -58,6 +57,31 @@ module Jekyll
     end
   end
   module EncFilter
+
+    $KeyMap = {}
+    def genKey(password)
+      cacheKey = $KeyMap[password]
+      if cacheKey
+        return cacheKey
+      end
+      salt = 'this is a salt string 20221019'
+      iter = 12345
+      key_len = 32
+      key = OpenSSL::KDF.pbkdf2_hmac(password, salt: salt, iterations: iter,
+          length: key_len, hash: "sha256")
+      $KeyMap[password] = key
+      return key
+    end 
+
+    def encrypt(msg,password)
+      cipher = OpenSSL::Cipher::AES.new(256, :GCM).encrypt
+      iv = cipher.random_iv
+      cipher.iv = iv
+      cipher.key = genKey password
+      encrypted = cipher.update(msg) + cipher.final
+      return  'E1.' + Base64.strict_encode64(iv  + encrypted + cipher.auth_tag)
+      
+    end 
     def get_encrypt_id(content,page)
       key = EncFilterTool.getKey(content,page)
       if key != nil && key.length > 0
@@ -68,15 +92,9 @@ module Jekyll
     end
 
     def  encrypt_content(content,page,prefix)
-      keyOri = EncFilterTool.getKey(content,page)
-      keyOri = prefix + keyOri + prefix
-      key = Digest::MD5.hexdigest(keyOri).downcase()
-      iv = Digest::MD5.hexdigest(content).downcase()
-      ivHex = iv[0...16]
-      iv = ivHex.scan(/../).map { |x| x.hex.chr }.join
-      encryptor = Salsa20.new(key, iv)
-      encrypted_text = encryptor.encrypt(content)
-      return ivHex + ":" + Base64.strict_encode64(encrypted_text)
+      psw = EncFilterTool.getKey(content,page)
+      psw = prefix + psw + prefix
+      return encrypt content,psw
     end
 
     

data/lib/version/version.rb

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

data/test.rb

@@ -1,18 +1,67 @@
 #!/usr/bin/env ruby
-# require "ltec"
-# require "nostyleplease2plugins"
-
-# Jekyll::test
- 
-a = '12-3 a    3 3'
-b = a.split('x')
-z = nil;
-if z
-    puts 333
-else
-    puts 44    
-end
-puts b
-puts b[0]
-z = 333
-puts "<img src='#{z}' style='width:#{z}px'>"
+
+require 'openssl'
+require 'base64'
+$Key = {}
+def genKey(password)
+    cache = $Key[password]
+    if cache
+        puts "cache",cache
+        return cache
+    end
+    salt = 'this is a salt string 20221019'
+    iter = 12345
+    key_len = 32
+    key = OpenSSL::KDF.pbkdf2_hmac(password, salt: salt, iterations: iter,
+        length: key_len, hash: "sha256")
+    $Key[password] = key
+    return key
+end 
+
+def encrypt(msg,password)
+    
+    cipher = OpenSSL::Cipher::AES.new(256, :GCM).encrypt
+    iv = cipher.random_iv
+    cipher.iv = iv
+    cipher.key = genKey password
+    encrypted = cipher.update(msg) + cipher.final
+    return  'E1.' + Base64.strict_encode64(iv  + encrypted + cipher.auth_tag)
+    
+end 
+
+
+def decrypt(enstring,password)
+    b64 = enstring[3..-1]
+    data = Base64.strict_decode64 b64
+
+    len = data.bytesize
+    iv = data[0...12]
+    auth_tag = data[0...16] #data[len-16..-1]
+    encdata = data[12...len-16]
+
+
+    cipher = OpenSSL::Cipher::AES.new(256, :GCM).decrypt
+    cipher.iv = iv
+    cipher.key = genKey password
+    # cipher.auth_tag = '1234567890123456'
+    
+    result = cipher.update(encdata)
+    return result 
+    
+end 
+
+
+msg = '我的 12a23007'
+z = encrypt msg,'123'
+puts z 
+
+puts z[3..-1]
+
+m = decrypt z ,'123'
+puts m
+
+genKey '123'
+genKey '123'
+genKey '123'
+genKey '456'
+puts $Key

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: no-style-please2-plugins
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.1
 platform: ruby
 authors:
 - vitock
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-23 00:00:00.000000000 Z
+date: 2022-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.2
-- !ruby/object:Gem::Dependency
-  name: salsa20
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: digest
   requirement: !ruby/object:Gem::Requirement