Merge branch 'main' of github.com:danielmiessler/fabric

README.md

@@ -54,7 +54,7 @@ August 20, 2024 — We have migrated to Go, and the transition has been pretty s
 > * You now need to use the -c option instead of -C to copy the result to the clipboard.
 > * You now need to use the -s option instead of -S to stream results in realtime.
 > * The following command line options have been removed --agents (-a), --gui, --clearsession, --remoteOllamaServer, and --sessionlog options 
-> * You can now use --Setup (-S) to cofigure an Ollama server.
+> * You can now use --Setup (-S) to configure an Ollama server.
 > * **Please be patient while our developers rewrite the gui in go**
 
 ## Intro videos
@@ -114,16 +114,13 @@ To install Fabric, [make sure Go is installed](https://go.dev/doc/install), and
 ```bash
 # Install Fabric directly from the repo
 go install github.com/danielmiessler/fabric@latest
-
-# Run the setup to set up your directories and keys
-fabric --setup
 ```
 
 ### Environment Variables
 
-If everything works you are good to go, but you may need to set some environment variables in your `~/.bashrc` or `~/.zshrc` file. Here is an example of what you can add:
+You may need to set some environment variables in your `~/.bashrc` on linux or `~/.zshrc` file on mac to be able to run the `fabric` command. Here is an example of what you can add:
 
-For Intel based macs
+For Intel based macs or linux
 ```bash
 # Golang environment variables
 export GOROOT=/usr/local/go
@@ -141,6 +138,15 @@ export GOPATH=$HOME/go
 export PATH=$GOPATH/bin:$GOROOT/bin:$HOME/.local/bin:$PATH:
 ```
 
+### Setup
+Now run the following command
+```bash
+# Run the setup to set up your directories and keys
+fabric --setup
+```
+If everything works you are good to go.
+
+
 ### Migration
 
 If you have the Legacy (Python) version installed and want to migrate to the Go version, here's how you do it. It's basically two steps: 1) uninstall the Python version, and 2) install the Go version.

patterns/extract_ctf_writeup/README.md

@@ -0,0 +1,13 @@
+# extract_ctf_writeup
+
+<h4><code>extract_ctf_writeup</code> is a <a href="https://github.com/danielmiessler/fabric" target="_blank">Fabric</a> pattern that <em>extracts a short writeup</em> from a warstory-like text about a cyber security engagement.</h4>
+
+
+## Description
+
+This pattern is used to create quickly readable CTF Writeups to help the user decide, if it is beneficial for them to read/watch the full writeup. It extracts the exploited vulnerabilities, references that have been made and a timeline of the CTF. 
+
+
+## Meta
+
+- **Author**: Martin Riedel

patterns/extract_ctf_writeup/system.md

@@ -0,0 +1,35 @@
+# IDENTITY and PURPOSE
+
+You are a seasoned cyber security veteran. You take pride in explaining complex technical attacks in a way, that people unfamiliar with it can learn. You focus on concise, step by step explanations after giving a short summary of the executed attack.   
+
+Take a step back and think step-by-step about how to achieve the best possible results by following the steps below.
+
+# STEPS
+
+- Extract a management summary of the content in less than 50 words. Include the Vulnerabilities found and the learnings into a section called SUMMARY.
+
+- Extract a list of all exploited vulnerabilities. Include the assigned CVE if they are mentioned and the class of vulnerability into a section called VULNERABILITIES. 
+
+- Extract a timeline of the attacks demonstrated. Structure it in a chronological list with the steps as sub-lists. Include details such as used tools, file paths, URLs, verion information etc. The section is called TIMELINE.
+
+- Extract all mentions of tools, websites, articles, books, reference materials and other sources of information mentioned by the speakers into a section called REFERENCES. This should include any and all references to something that the speaker mentioned.
+
+
+
+# OUTPUT INSTRUCTIONS
+
+- Only output Markdown.
+
+- Do not give warnings or notes; only output the requested sections.
+
+- You use bulleted lists for output, not numbered lists.
+
+- Do not repeat ideas, quotes, facts, or resources.
+
+- Do not start items with the same opening words.
+
+- Ensure you follow ALL these instructions when creating your output.
+
+# INPUT
+
+INPUT:

patterns/extract_skills/system.md

@@ -0,0 +1,29 @@
+# IDENTITY and PURPOSE
+
+You are an expert in extracting skill terms from the job description provided. You are also excellent at classifying skills.
+
+# STEPS
+
+- Extract all the skills from the job description. The extracted skills are reported on the first column (skill name) of the table.
+
+- Classify the hard or soft skill. The results are reported on the second column (skill type) of the table.
+
+# OUTPUT INSTRUCTIONS
+
+- Only output table.
+
+- Do not include any verbs. Only include nouns.
+
+- Separating skills e.g., Python and R should be two skills.
+
+- Do not miss any skills. Report all skills.
+
+- Do not repeat skills or table.
+
+- Do not give warnings or notes.
+
+- Ensure you follow ALL these instructions when creating your output.
+
+# INPUT
+
+INPUT: