wipHEADmain

3 files changed, 45 insertions, 24 deletions

diff --git a/README.md b/README.md
index d0d2f02..caeb3b0 100644
--- a/README.md
+++ b/README.md
@@ -1,21 +1,24 @@
 # lclipd
+
 A small clipboard manager in lua.</br>
 
 # How it works
-* lclipd runs the clipboard contents through `detect-secrets` and then puts the content in a sqlite3 database
-* X11, Wayland, Tmux and custom clipboard commands are supported
-* it is meant to be run as a user service. It can also be simply run by just running the script directly
-* the logs are put in the system log
-* lclipd does not require elevated privileges to run nor does it need to have extra capabilities
-* exposes a TCP server(yes a TCP server, not an HTTP server) which you can use to query the db(on localhost:9999 by default)
+
+- lclipd runs the clipboard contents through `detect-secrets` and then puts the content in a sqlite3 database
+- X11, Wayland, Tmux and custom clipboard commands are supported
+- it is meant to be run as a user service. It can also be simply run by just running the script directly
+- the logs are put in the system log
+- lclipd does not require elevated privileges to run nor does it need to have extra capabilities
+- exposes a TCP server(yes a TCP server, not an HTTP server) which you can use to query the db(on localhost:9999 by default)
 
 ## Requirements
-* lua5.3
-* [luaposix](https://github.com/luaposix/luaposix)
-* [argparse](https://github.com/mpeterv/argparse)
-* [luasqlite3](http://lua.sqlite.org/index.cgi/home): luasqlite3 comes in two flavours. One includes sqlite3 in the lua rock itself and one does not. If you choose to install the rock without sqlite3 you need to have sqlite3 installed on your system.
-* [detect-secrets](https://github.com/Yelp/detect-secrets)
-* `xclip` ot `wl-clipboard` or whatever clipboard command you use
+
+- lua5.3
+- [luaposix](https://github.com/luaposix/luaposix)
+- [argparse](https://github.com/mpeterv/argparse)
+- [luasqlite3](http://lua.sqlite.org/index.cgi/home): luasqlite3 comes in two flavours. One includes sqlite3 in the lua rock itself and one does not. If you choose to install the rock without sqlite3 you need to have sqlite3 installed on your system.
+- [detect-secrets](https://github.com/Yelp/detect-secrets)
+- `xclip` ot `wl-clipboard` or whatever clipboard command you use
 
 ```sh
 luarocks install --local luaposix
@@ -27,6 +30,7 @@ pipx install detect-secrets
 ## Usage
 
 lclipd is technically just the "backend". One way to have a "frontend" is to use something like dmenu:</br>
+
 ```sh
 #!/usr/bin/env sh
 
@@ -34,6 +38,7 @@ SQL_DB="$(cat /tmp/lclipd/lclipd_db_name)"
 content=$(sqlite3 "${SQL_DB}" "select replace(content,char(10),' '),id from lclipd;" | dmenu -D "|" -l 20 -p "lclipd:")
 sqlite3 "${SQL_DB}" "select content from lclipd where id = ${content}" | xsel -ib
 ```
+
 You can swap `xclip` with `wl-paste` for wayland.</br>
 For the above to work you have to have added the `dynamic` patch to dmenu.</br>
 
@@ -41,11 +46,13 @@ You could also query the db through the TCP server.</br>
 The TCP server will return a JSON array as a response.</br>
 You can use something like `jq` for further processing of the returned JSON object on the shell.</br>
 An example of a terminal-oriented "frontend":
+
 ```sh
 tmux set-buffer $(echo 'select * from lclipd;' | nc 127.0.0.1 9999 | jq '.[1]' | awk '{print substr($0, 2, length($0) - 2)}' | fzf)
 ```
 
 The author has this setup in their `.zshrc`:
+
 ```sh
 fzf_lclipd() {
   local clipboard_content=$(echo 'select * from lclipd;' | nc 127.0.0.1 9999 | jq '.[1]' | awk '{print substr($0, 2, length($0) - 2)}' | fzf-tmux -p 80%,80%)
@@ -56,10 +63,11 @@ fzf_lclipd() {
 zle -N fzf_lclipd
 bindkey '^O' fzf_lclipd
 ```
-You can also put the db on a network share and then have different instanecs on different hosts use the same common db, effectively sharing your clipboard between different devices on the same subnet.</br>
 
+You can also put the db on a network share and then have different instanecs on different hosts use the same common db, effectively sharing your clipboard between different devices on the same subnet.</br>
 
 You can run lclipd as a user service. The author uses this for runit:</br>
+
 ```sh
 #!/bin/sh
 exec \
@@ -111,14 +119,18 @@ Options:
 ```
 
 ## Supported OSes
+
 lcilpd uses luaposix so any POSIX-half-compliant OS will do.</br>
 
 ## Acknowledgements
-* [luaposix](https://github.com/luaposix/luaposix) - pretty much all the "heavy lifting" is done using luaposix
-* [detect-secrets](https://github.com/Yelp/detect-secrets)
-* [luasqlite3](http://lua.sqlite.org/index.cgi/home)
-* [json.lua](https://github.com/rxi/json.lua) - used as a vendored dependency
-* [argparse](https://github.com/mpeterv/argparse)
+
+- [luaposix](https://github.com/luaposix/luaposix) - pretty much all the "heavy lifting" is done using luaposix
+- [cqueue](https://github.com/wahern/cqueues)
+- [detect-secrets](https://github.com/Yelp/detect-secrets)
+- [luasqlite3](http://lua.sqlite.org/index.cgi/home)
+- [json.lua](https://github.com/rxi/json.lua) - used as a vendored dependency
+- [argparse](https://github.com/mpeterv/argparse)
 
 ## TODO
-* support `in-memory` and `temporary` databases.
+
+- support `in-memory` and `temporary` databases.
diff --git a/ollama.lua b/ollama.lua
index 3692c67..0529ea3 100644
--- a/ollama.lua
+++ b/ollama.lua
@@ -21,14 +21,20 @@ function ollama.ollama_req(clipboard_content)
         messages = {
             {content = clipboard_content, role = "user"}, {
                 content = [[
-            a public key is not a secret.
-            a private key is a secret.
-            a private key is a seceret.
+            Learn the following rules. the rules are provided in no particular order:
+            ---
+            a public key of an assymetric key-pair is a secret.
+            a private key of an assymetric key-pair is a secret.
             an api key is a secret.
             a password is a secret.
-            a token is a secret.
+            a token used for authentication or authorization is a secret.
             a key-value pair is a secret if the key contains the word 'password'or 'secret' or 'token' or 'key'.
+            a string containing the word 'password' or 'secret' or 'token' or 'key' is a secret.
+            a string that contains a word longer than 20 characters is a secret.
+            a word that is not part of any of the languages you know which is longer than 20 characters is a secret.
             a long string of random characters is a secret.
+            one matching positive matching criteria is enough to consider a string a secret.
+            ---
             ]],
                 role = "assistant"
             }, {
@@ -38,6 +44,8 @@ function ollama.ollama_req(clipboard_content)
                 The answer must have a field named 'reasoning'.
                 The value of 'isSecret' must be a boolean.
                 The value of reasoning must be a string.
+                You must give a reason.
+                The reason must be the criteria that was used to determine if the string is a secret.
                 The answer must be valid json.
                 ]],
                 role = "assistant"
diff --git a/test.lua b/test.lua
index 5efc9c4..b1def19 100755
--- a/test.lua
+++ b/test.lua
@@ -5,8 +5,9 @@ local ollama = require("ollama")
 
 luaunit.assertEquals(ollama.ask_ollama(
                          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEs3GbmHMO0n1rL2vsn7+AH9xJwZ9BOUU6rR6x7hW8uX devi@terminaldweller.com",
-                         5), false)
+                         5), true)
 luaunit.assertEquals(ollama.ask_ollama('password="12345661234"', 5), true)
 luaunit.assertEquals(ollama.ask_ollama(
                          "W65X2UljhbM0H9kTVogZ8TnCnIqPbCvvqVUsjZ9gWxjWgFiR1Uzolouc1ghKXUyqinhVcZ1lHnXWv2jHoVRU0dC0DZdyDgYfUiHdBwAeqryc0fT6d7nxgs0UErgwOkNt8S9tKUwadRscS8VV7q2j6F5FvSfyTGflluminatevrFOcGwD1RXkJP0J2aVQWxCCszvTSNhRPTM3TeUw8dXoapXTb2IcSUwKCvAdEhemFOsgU27wF7vHYDrm6GMVofZEwAitpVQxDDPvl7qefIuXdFuDJthnxH8uUJpEbSTWXyFLaE0n5QS063grrx0ar1TCxOpJiiGTSadDeTx8OQAyemqQYj7LoYCkdKCHX7G8VSEuJlFJ6R2CM",
                          5), true)
+luaunit.assertEquals(ollama.ask_ollama('hello my name is', 5), false)