no-style-please2 0.9.1 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a414bf659d218a6172f51f2f94d2690ed5fcaa0cdfbb1ab86defce0f30d11f2
-  data.tar.gz: 765ae86a6dd407d9f599193cacf792e3d23ee15df877da5e52ec9fc2eba639d1
+  metadata.gz: f1153b0ca84cca1f649bbc632a249df3c01b028d2bc9c4afe21bac1ef2ca4662
+  data.tar.gz: aa9b649d2f6b76789fc9872c75a76ba580dfc41b08518e66b7deb934ebde7ecd
 SHA512:
-  metadata.gz: 4e4ddcde05a6447b796245e22cc5a93c52993c757faca894006996decd41588d0e2deea863df4360defd614d757cf7948c9cc615ec5e89eb064281d93ee6a59b
-  data.tar.gz: 78f79386b22615140119143f94e6eb902c5a0cef3180ab6e585e9437c39e55d3dd33840f292ba5b365f290ddb3fd8b52238cc15f86fac30b765649ee87a6b63d
+  metadata.gz: 6d27d229ca31b46aff72e88311ab2c751f6d02c4fbe8437b6b9765a3e2bd938d2914e621cc94ff694f1f737a6aca10dc285d896d01e0b003f5316f10dbbb58f1
+  data.tar.gz: 6beac21e1b80e63c40399da8d12f2663e20f44993b7e8b487c639f4d2f0e3065080b0009c94917e4f161fb81e902c35db903b6b7e7bc95c241cb0b88bf8f5aa9

data/README.md

@@ -7,9 +7,9 @@ Inspired by [elly's site](http://tilde.town/~elly/) [riggraz](https://riggraz.de
 
 <img src="https://raw.githubusercontent.com/riggraz/no-style-please/master/_screenshots/featured-image.png" />
 
-## Features
+# Features
 
-+ ### new
++ # new
   + tags support 
   + mathjax , inluce_code post_link support, include  support, link to other post 
   + encrytion support. Only those who know the password can view the article
@@ -18,12 +18,34 @@ Inspired by [elly's site](http://tilde.town/~elly/) [riggraz](https://riggraz.de
   ONLY textual contents of article will be encrypted ,the pictures will  **NOT** be encrypted
 
   
-  #### Encrypt your post
+# Encrypt your post
 
+Here are two options for encrypting your password: the first is a web-based method, and the second involves using a Ruby tool. We highly recommend choosing the web-based method.
 
-> ✧ Using this [web tool, it's very convenient to complete the following tasks](https://vitock.github.io/jekyll-zeta/post/2024/12/30/ToolForEncryption.html) 
+> ✧ Using this [web tool, it's very convenient to complete the following tasks](https://vitock.github.io/jekyll-zeta/Proctect-your-password) 
 
+1. get your privateKey
+  open the website 'https://vitock.github.io/jekyll-zeta/Proctect-your-password'
+  ![](s1.png)
 
+2. encrypt Your password 
+  ![](s2.png)
+
+3. edit the `_config.yml`
+   
+![alt text](image.png)
+
+4. set your private Key to github ci 
+   ![alt text](image-1.png)
+   ![alt text](image-2.png)
+
+5. push the repo
+
+## using web tool
+
+1. generate keypair through this website
+
+## using ruby tool
 
 
       1. generate your own public & private key to protect your password

data/_config.yml

@@ -60,3 +60,9 @@ enc_tags:
     - tag: encrypt2
       # 123
       password: AQAQACAAIQCvWkhJdhn0b21Pz381AdTeMLb5bRO4d2F3usQtpIL0fDD0G8cg4klENXxJNX+rAHwD8VW2iJo4hZKDQrjdOjbJFugo60XnMmbdLEfzXpkqGpjjbe875/owWyNnGGPk3Vf4
+    - tag: encrypt_abc
+      # abc
+      password: AQAQACAAIQCX8chuGK6MCLP9eGuTUCcmHwjxAQv74m/iir3IzZU1j9JPyGnfi2qGNcU3dryjTT8Co4V6vRtgbnl3onQBcO3hcC8FgCd9KJpe/F59TIdmyEPTER1U2OSG5xo6jsFzsAxt
+    - tag: encrypt_456
+       
+      password: AQAQACAAIQASewKsG2ThLm8E0ZQEvTxhoQ3VbVDECINAwi9mxoHJiT5xI8pjCMgfeSpx3q4WpusD6EaCifx7ZjeZeVfdZDVKIJ86CIZbyMPLNwJoNP1K/XWbCiyvtzoMF5nbBtkIgKeJ

data/_includes/encrypted.html

@@ -25,13 +25,34 @@
         var exports = exports || {} 
     </script>
     <script src="//cdn.jsdelivr.net/gh/vitock/jsdelivr@0.1.2/js/base64js.js"></script>
+
+  <script>
+
+  
+  </script>
+
+  
+
+
     <script>
+
+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(){
 
             const substl = crypto.subtle
             const preFix = '{{encid}}';
             const encid = preFix
-            const encryptedContent = '{{ content | encrypt_content:page, encid}}'
+            const encryptedContent = contentEnc;
             const base64str = encryptedContent.substring(3)
             const bfMsg = base64js.decode(base64str)
             const bfIv = bfMsg.subarray(0,12)
@@ -47,11 +68,90 @@
                 return  await substl.deriveBits(pbkdf2,key,256);
             }
 
+        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-CTR",
+            }
+            var keyObj = await substl.importKey('raw',key,aeskey,false,['decrypt'])
+            var aesDec= {name: "AES-CTR",counter:bfIv,length:64};
+            try{
+                let bfDec  = await substl.decrypt(aesDec,keyObj,bfCipher)
+                return  new  Uint8Array(bfDec)
+            }catch (error) {
+                throw error
+            }
+             
+        }
+ 
+        async function decryptBase64Msg(msg64,key){
+            const base64str = msg64;
+            const bfMsg = base64js.decode(base64str)
+            return await decryptRaw(bfMsg,key)
+
+        }
+        async function checkKey(key){
+            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)
+
+
+            const bfKeyData = base64js.decode(keyData)
+            let keyBf = null
+            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 (error) {
+                     
+                }
+            }
+             
+            return keyBf
+        }
  
         async function decrypt (key0,isCached){
             // const key = Uint8Array([...]); // 32 bytes key
-            
             var key  = ''
             if(isCached){
                 key = readKey()
@@ -63,15 +163,12 @@
             if (key.length == 0) {
                 return
             }
-
-            var aeskey = {
-                name:"AES-GCM",
-                length:256
-            }
-            var keyObj = await substl.importKey('raw',key,aeskey,false,['decrypt'])
-            var aesDec= {name: "AES-GCM",iv:bfIv,tagLength:128}
             try {
-                var bfDec  = await substl.decrypt(aesDec,keyObj,bfCipher)
+                let keyBf = await checkKey(key)
+                if(!keyBf){
+                    throw 'error psw'
+                }
+                var bfDec  = await decryptBase64Msg(contentEnc,keyBf)
                 var plain = new TextDecoder().decode(bfDec);
                 setKey(key)
                 document.getElementById("encrypted").style.display = 'none'
@@ -92,6 +189,7 @@
     
                 }, 500);
             } catch (error) {
+                console.log(error)
                 alert("wrong password.")
             }
         }
@@ -121,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/_includes/post_list.html

@@ -14,8 +14,7 @@
   <ul>
     {%- for post in posts limit: include.limit -%}
         <li>
-          <span>{{- post.date | date: site.theme_config.date_format -}}</span>
-          <a href="{{ post.url | relative_url }}">{{ post.title | downcase }}</a>
+          {% include postitem.html post=post%}
         </li>
     {%- endfor -%}
     {%- if include.show_more and limit_exceeded -%}

data/_includes/postitem.html

@@ -0,0 +1,11 @@
+{% capture archive_date_titleformat %} {{ site.theme_config.archive_title_date_format | default: "%m-%d"}}{% endcapture %}
+{%- assign post = include.post -%}
+{%- assign fmt = include.fmt | default:archive_date_titleformat -%}
+
+{% assign encid = '' | get_encrypt_id:post | default: "" %}
+<span>{{- post.date | date: fmt }}</span> 
+<a href="{{ post.url | relative_url }}">{{ post.title | downcase }} 
+    {%- if encid.size > 1 -%}
+    <img  style="width:12px;height:12px;display: inline;margin-left: 5px;" src="{{ 'assets/image/lock.svg' | relative_url}}">
+    {%- endif -%}
+</a>

data/_layouts/archive.html

@@ -27,8 +27,7 @@ layout: default
     {% assign ymPre = ymCur %}
     
     <li>
-          <span>{{- post.date | date: archive_date_titleformat }}</span>
-          <a href="{{ post.url | relative_url }}">{{ post.title | downcase }}</a>
+        {% include postitem.html post=post%}
     </li>
 
 {%- endfor -%}

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 }}

data/_layouts/tagpage.html

@@ -7,9 +7,7 @@ layout: default
 
 <ul>
   {% for post in site.tags[page.tag] %}
-  <li><a href="{{ site.baseurl }}{{ post.url }}">{{ post.title }}</a> ({{ post.date | date_to_string }})<br>
-      {{ post.description }}
-        </li>
+  <li>{% include postitem.html post=post fmt="%Y-%m-%d" %}</li>
         {% endfor %}
 
 {% if site.theme_config.tag_showall %}

data/assets/image/lock.svg

@@ -0,0 +1,7 @@
+<svg width="500" height="500" xmlns="http://www.w3.org/2000/svg" t="1685339750585" class="icon" version="1.1" p-id="3294">
+ <g>
+  <title>Layer 1</title>
+  <path d="m160.80336,228.40263l177.01586,0l0,-67.57791q0,-37.30864 -25.93006,-63.70627t-62.57787,-26.39763t-62.57787,26.39763t-25.93006,63.70627l0,67.57791l0,0zm287.65078,33.78896l0,202.73375q0,14.07874 -9.68056,23.93385t-23.50992,9.85512l-331.90475,0q-13.82936,0 -23.50992,-9.85512t-9.68056,-23.93385l0,-202.73375q0,-14.07874 9.68056,-23.93385t23.50992,-9.85512l11.0635,0l0,-67.57791q0,-64.76217 45.6369,-111.22199t109.25198,-46.45982t109.25198,46.45982t45.6369,111.22199l0,67.57791l11.06349,0q13.82936,0 23.50992,9.85512t9.68056,23.93385l0,0z" p-id="3295" id="svg_1"/>
+ </g>
+
+</svg>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: no-style-please2
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.3
 platform: ruby
 authors:
 - vitock
 autorequire:
 bindir: bin
 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
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.9.0
 description:
 email:
 - r
@@ -55,9 +55,9 @@ files:
 - _includes/head.html
 - _includes/heatmap.html
 - _includes/heatmap.js
-- _includes/main.css
 - _includes/menu_item.html
 - _includes/post_list.html
+- _includes/postitem.html
 - _layouts/archive.html
 - _layouts/default.html
 - _layouts/heatmap.html
@@ -69,6 +69,7 @@ files:
 - _sass/heatmap.scss
 - _sass/no-style-please.scss
 - assets/css/main.scss
+- assets/image/lock.svg
 - assets/js/mouse_coords.js
 homepage: https://github.com/vitock/no-style-please
 licenses:

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; }