From bdfa2d29290573fdaa93690bf7083f7296af5af9 Mon Sep 17 00:00:00 2001
From: Dominique RIGHETTO <righettod@users.noreply.github.com>
Date: Sun, 28 Jan 2024 19:32:03 +0100
Subject: [PATCH 1/3] Add files via upload

---
 http/exposed-panels/friendica-panel.yaml | 40 ++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 http/exposed-panels/friendica-panel.yaml

diff --git a/http/exposed-panels/friendica-panel.yaml b/http/exposed-panels/friendica-panel.yaml
new file mode 100644
index 0000000000..c10a2837e6
--- /dev/null
+++ b/http/exposed-panels/friendica-panel.yaml
@@ -0,0 +1,40 @@
+id: friendica-panel
+
+info:
+  name: Friendica Panel - Detect
+  author: righettod
+  severity: info
+  description: |
+    Friendica was detected.
+  reference:
+    - https://friendi.ca/
+  metadata:
+    max-request: 1
+    verified: true
+    shodan-query: http.title:"Friendica"
+  tags: friendica,panel,login,detect
+
+http:
+  - method: GET
+    path:
+      - "{{BaseURL}}/"
+
+    matchers-condition: and
+    matchers:
+      - type: word
+        part: body
+        words:
+          - "friendica.webmanifest"
+          - 'content="Friendica'
+        condition: and
+
+      - type: status
+        status:
+          - 200
+
+    extractors:
+      - type: regex
+        part: body
+        group: 1
+        regex:
+          - '(?i)v=([a-z0-9.-]+)'
\ No newline at end of file

From 1bb5100edc339bbdbd6b30663ec9d1567a0776fa Mon Sep 17 00:00:00 2001
From: Dhiyaneshwaran <leedhiyanesh@gmail.com>
Date: Tue, 30 Jan 2024 13:40:16 +0530
Subject: [PATCH 2/3] minor update

---
 http/exposed-panels/friendica-panel.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/http/exposed-panels/friendica-panel.yaml b/http/exposed-panels/friendica-panel.yaml
index c10a2837e6..e7e8ddd1ca 100644
--- a/http/exposed-panels/friendica-panel.yaml
+++ b/http/exposed-panels/friendica-panel.yaml
@@ -5,9 +5,9 @@ info:
   author: righettod
   severity: info
   description: |
-    Friendica was detected.
+    Friendica Login Panel was detected.
   reference:
-    - https://friendi.ca/
+    - https://friendi.ca
   metadata:
     max-request: 1
     verified: true
@@ -17,7 +17,7 @@ info:
 http:
   - method: GET
     path:
-      - "{{BaseURL}}/"
+      - "{{BaseURL}}"
 
     matchers-condition: and
     matchers:
@@ -37,4 +37,4 @@ http:
         part: body
         group: 1
         regex:
-          - '(?i)v=([a-z0-9.-]+)'
\ No newline at end of file
+          - '(?i)v=([a-z0-9.-]+)'

From 9c34fd86d15ca15cbb8acc8aeaba2a3dfd98e5e8 Mon Sep 17 00:00:00 2001
From: Ritik Chaddha <44563978+ritikchaddha@users.noreply.github.com>
Date: Tue, 30 Jan 2024 13:48:33 +0530
Subject: [PATCH 3/3] FN result - fix matcher

---
 http/exposed-panels/friendica-panel.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/http/exposed-panels/friendica-panel.yaml b/http/exposed-panels/friendica-panel.yaml
index e7e8ddd1ca..f84a473391 100644
--- a/http/exposed-panels/friendica-panel.yaml
+++ b/http/exposed-panels/friendica-panel.yaml
@@ -24,9 +24,10 @@ http:
       - type: word
         part: body
         words:
-          - "friendica.webmanifest"
+          - 'title="Search in Friendica'
+          - 'Welcome to Friendica Social Network'
           - 'content="Friendica'
-        condition: and
+        condition: or
 
       - type: status
         status: