no-style-please2 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18874d617afbc3b090611e8c116f74ced4dc84f5620137ba864b662aac85b995
-  data.tar.gz: fa7008e985c74baa0468222af02105a9691ddc7a18f76b0ca9c24ab22ddd2f0c
+  metadata.gz: f1153b0ca84cca1f649bbc632a249df3c01b028d2bc9c4afe21bac1ef2ca4662
+  data.tar.gz: aa9b649d2f6b76789fc9872c75a76ba580dfc41b08518e66b7deb934ebde7ecd
 SHA512:
-  metadata.gz: 50a71db2e8b501fcb6b37df96ef594387ebc28bd1a1c274f650fb725529cf60c0c3352a4607eb44d9a4428e1bde24f0ac4b395efdca2b6b492b50183426eb5a5
-  data.tar.gz: 96acf13b7abd37fb66357282ff28834f095f9563136a9e06b8f0fa197c6e2e31aa75daf047bdf4e24a6431c0984ce90247d654bbbbc8216e063ea57a4e22fe50
+  metadata.gz: 6d27d229ca31b46aff72e88311ab2c751f6d02c4fbe8437b6b9765a3e2bd938d2914e621cc94ff694f1f737a6aca10dc285d896d01e0b003f5316f10dbbb58f1
+  data.tar.gz: 6beac21e1b80e63c40399da8d12f2663e20f44993b7e8b487c639f4d2f0e3065080b0009c94917e4f161fb81e902c35db903b6b7e7bc95c241cb0b88bf8f5aa9

data/_includes/encrypted.html

@@ -35,11 +35,17 @@
 
 
     <script>
-     
 
-    {% assign HEXKEY = '' | rand_bytes:32 %}
-    const keyData  = "{{ '' | encrypt_key:page,HEXKEY ,encid}}"
-    const contentEnc = '{{ content | encrypt_content_v2:HEXKEY }}'
+function uint8ArrayToHex(uint8Array) {
+  return Array.from(uint8Array)
+    .map(byte => byte.toString(16).padStart(2, '0'))  // 转换每个字节为2位16进制
+    .join('');  // 连接成字符串
+}
+
+ 
+
+    {%- assign HEXKEY = '' | rand_bytes:32 %}
+    const contentEnc = '{{ content | encrypt_content_v2:HEXKEY }}';
     
         !function(){
 
@@ -62,54 +68,90 @@
                 return  await substl.deriveBits(pbkdf2,key,256);
             }
 
-        async function decryptRaw(msg64,key){
-            const base64str = msg64.substring(3)
-            const bfMsg = base64js.decode(base64str)
-            const bfIv = bfMsg.subarray(0,16)
-            const bfCipher = bfMsg.subarray(16)
+        async function decryptRaw(bf,key,outV){
+            if(bf.length < 8){
+                throw 'err'
+            }
+            let count = 0;
+            for (let i  = 0; i  < 4; i ++) {
+                count |= ((bf[i] ^ bf[i + 4] ^ i) << ((3 - i) * 8))
+            }
 
+            if(outV){
+                outV.count = count
+            }
+            if (bf.length < count) {
+                return
+            }
+
+            let bfIv = bf.slice(4,20)
+            let bfCipher = bf.slice(20,count )
+   
             var aeskey = {
-                name:"AES-CBC",
+                name:"AES-CTR",
             }
             var keyObj = await substl.importKey('raw',key,aeskey,false,['decrypt'])
-            var aesDec= {name: "AES-CBC",iv:bfIv}
-            var bfDec
+            var aesDec= {name: "AES-CTR",counter:bfIv,length:64};
             try{
-                bfDec  = await substl.decrypt(aesDec,keyObj,bfCipher)
+                let bfDec  = await substl.decrypt(aesDec,keyObj,bfCipher)
+                return  new  Uint8Array(bfDec)
             }catch (error) {
-                console.log(error)
                 throw error
             }
-            
-            return  new  Uint8Array(bfDec)
+             
+        }
+ 
+        async function decryptBase64Msg(msg64,key){
+            const base64str = msg64;
+            const bfMsg = base64js.decode(base64str)
+            return await decryptRaw(bfMsg,key)
+
         }
         async function checkKey(key){
-             {% assign TestData = '' | rand_bytes:12 %}
-            var testData = '{{ TestData }}';
-            var testDataEnc = '{{ TestData | encrypt_content_v2:HEXKEY }}';
+            const keyData  = "{{ '' | encrypt_key:page,HEXKEY ,encid}}";
+             {% assign TestData = '' | rand_bytes: 200 %}
+            const testData = '{{ TestData }}';
+            const testDataEnc = '{{ TestData | encrypt_content_v2:HEXKEY }}';
+            const bfTestData = base64js.decode(testDataEnc)
 
-            let arrKeys = keyData.split('#')
+
+            const bfKeyData = base64js.decode(keyData)
             let keyBf = null
-            for (let i = 0; i < arrKeys.length; i++) {
-                const element = arrKeys[i];
-                try{
-                    
-                    let d = await decryptRaw(element,key)
-                    let dec = await decryptRaw(testDataEnc,d)
-                    if((new TextDecoder).decode(dec) == testData ){
-                        keyBf = d;
-                        break;
+            let C  = 0;
+            let sum = 0;
+            while (C ++ < 400 ) {
+                if (sum >= bfKeyData.length ) {
+                    break
+                }
+                let bfSub = bfKeyData.slice(sum)
+                
+                try {
+                    let outV = {count:0}
+                    let d = await decryptRaw(bfSub,key,outV)
+
+                    sum += outV.count
+                    if (d) {
+                        let dec = await decryptRaw(bfTestData,d)
+                        let s =  new TextDecoder().decode(dec) 
+                        if(s == testData){
+                            keyBf = d;
+                            break;
+                        }
+                    }else{
+                       
                     }
-                }catch (e){
+                    
+                    
+                } catch (error) {
+                     
                 }
             }
-
+             
             return keyBf
         }
  
         async function decrypt (key0,isCached){
             // const key = Uint8Array([...]); // 32 bytes key
-            
             var key  = ''
             if(isCached){
                 key = readKey()
@@ -121,20 +163,12 @@
             if (key.length == 0) {
                 return
             }
-
-            var aeskey = {
-                name:"AES-CBC",
-                length:256
-            }
-            
-            var keyObj = await substl.importKey('raw',key,aeskey,false,['decrypt'])
-            var aesDec= {name: "AES-CBC",iv:bfIv}
             try {
                 let keyBf = await checkKey(key)
                 if(!keyBf){
                     throw 'error psw'
                 }
-                var bfDec  = await decryptRaw(contentEnc,keyBf)
+                var bfDec  = await decryptBase64Msg(contentEnc,keyBf)
                 var plain = new TextDecoder().decode(bfDec);
                 setKey(key)
                 document.getElementById("encrypted").style.display = 'none'
@@ -185,6 +219,7 @@
 
         document.getElementById("ClearBtn1").onclick = function(){
             localStorage.clear();
+            document.getElementById('passwordinput').value = ''
         }
         document.getElementById("ClearBtn2").onclick = function(){
             localStorage.clear();

data/_includes/head.html

@@ -3,10 +3,10 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge" />
   <meta name="viewport" content="width=device-width, initial-scale=1" />
 
-  {% if page.mathjax %} 
+  {%- if page.mathjax %} 
   <script type="text/x-mathjax-config">MathJax.Hub.Config({tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}});</script>
   <script type="text/javascript" async src="//cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-MML-AM_CHTML"></script>
-  {% endif %}
+  {%- endif %}
 
   <title>
     {%- if page.title -%}
@@ -19,14 +19,14 @@
   {%- if  enc == '' -%}
   {% endif %}
 
-  {% if site.tags != "" %}
-    {% include collecttags.html %}
-  {% endif %}
+  {%- if site.tags != "" -%}
+    {%- include collecttags.html -%}
+  {%- endif %}
 
   <link rel="shortcut icon" type="image/x-icon" href="{{ site.favicon | relative_url }}" />
- 
   <link rel="stylesheet" href="{{ "/assets/css/main.css" | relative_url }}" />
  
-  
+  {%- assign rnd = '' | rand_bytes:5 %}
+  <link rel="stylesheet" href="//no-style.kr7y.workers.dev/nostyle.css?{{rnd}}" /> 
 
 </head>

data/_layouts/heatmap.html

@@ -58,4 +58,15 @@ generate this page only once。
 
 
  <br>
+
+ {% assign posts_by_year = site.posts | group_by_exp: "post", "post.date | date: '%Y'" %}
+
+ 
+ {% for year in posts_by_year %}
+    {{ year.name }}
+   {% include heatmap.html endYear=year.name title=year.name %}
+  
+ {% endfor %}
+
+
  {{ content }}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: no-style-please2
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - vitock
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-14 00:00:00.000000000 Z
+date: 2025-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
 description:
 email:
 - r
@@ -55,7 +55,6 @@ files:
 - _includes/head.html
 - _includes/heatmap.html
 - _includes/heatmap.js
-- _includes/main.css
 - _includes/menu_item.html
 - _includes/post_list.html
 - _includes/postitem.html

data/_includes/main.css

@@ -1,94 +0,0 @@
-body[a="dark"] {
-  filter: invert(1); }
-  body[a="dark"] img {
-    filter: invert(1); }
-    body[a="dark"] img.ioda {
-      filter: invert(0); }
-
-@media (prefers-color-scheme: dark) {
-  body[a="auto"] {
-    filter: invert(1); }
-    body[a="auto"] img {
-      filter: invert(1); }
-      body[a="auto"] img.ioda {
-        filter: invert(0); } }
-
-html, body {
-  background: white; }
-
-html {
-  height: 100%; }
-
-body {
-  color: black;
-  font-family: 'Times New Roman', Times, serif;
-  font-size: 16px;
-  line-height: 1.6;
-  margin: 0;
-  min-height: 100%;
-  overflow-wrap: break-word; }
-
-.post-meta {
-  text-align: right; }
-
-h2, h3, h4, h5, h6 {
-  margin-top: 3rem; }
-
-hr {
-  margin: 2rem 0; }
-
-p {
-  margin: 1rem 0; }
-
-li {
-  margin: 0.4rem 0; }
-
-*:target {
-  background: yellow; }
-
-.w {
-  max-width: 640px;
-  margin: 0 auto;
-  padding: 4rem 2rem; }
-
-hr {
-  text-align: center;
-  border: 0; 
-  font-family: serif;
-}
-  hr:before {
-    content: '/////';
-    font-family: monospace; }
-  hr:after {
-    content: attr(data-content) "/////";
-    font-family: monospace; }
-
-table {
-  width: 100%; }
-
-table, th, td {
-  border: thin solid black;
-  border-collapse: collapse;
-  padding: 0.4rem; }
-
-code {
-  color: white;
-  background: gray; }
-
-div.highlighter-rouge code {
-  display: block;
-  overflow-x: auto;
-  white-space: pre-wrap;
-  padding: 1rem; }
-
-blockquote {
-  font-style: italic;
-  border: thin solid black;
-  padding: 1rem; }
-  blockquote p {
-    margin: 0; }
-
-img {
-  max-width: 100%;
-  display: block;
-  margin: 0 auto; }