v0.1.9 - program generates it's own private keys.

2025-11-20 07:53:58 -04:00
parent c1b615de32
commit e693fe3caa
36 changed files with 4542 additions and 188 deletions
--- a/tests/auth_test.sh
+++ b/tests/auth_test.sh
@@ -14,9 +14,9 @@ TESTS_PASSED=0
 TESTS_FAILED=0
 TOTAL_TESTS=0

-# Test keys for different scenarios
-TEST_USER1_PRIVKEY="5c0c523f52a5b6fad39ed2403092df8cebc36318b39383bca6c00808626fab3a"
-TEST_USER1_PUBKEY="87d3561f19b74adbe8bf840682992466068830a9d8c36b4a0c99d36f826cb6cb"
+# Test keys for different scenarios - Using WSB's keys for TEST_USER1
+TEST_USER1_PRIVKEY="22cc83aa57928a2800234c939240c9a6f0f44a33ea3838a860ed38930b195afd"
+TEST_USER1_PUBKEY="8ff74724ed641b3c28e5a86d7c5cbc49c37638ace8c6c38935860e7a5eedde0e"

 TEST_USER2_PRIVKEY="182c3a5e3b7a1b7e4f5c6b7c8b4a5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b2"
 TEST_USER2_PUBKEY="c95195e5e7de1ad8c4d3c0ac4e8b5c0c4e0c4d3c1e5c8d4c2e7e9f4a5b6c7d8e"
--- a/tests/auth_test_tmp/nip42_challenge
+++ b/tests/auth_test_tmp/nip42_challenge
@@ -1 +1 @@
-e3ba927d32ca105a8a4cafa2e013b97945a165c38e9ce573446a2332dc312fdb
+299c28eeb15df327c30c9afd952d4e35c3777443d2094b2caab2fc94599ce607
--- a/tests/file_put_bud02.sh
+++ b/tests/file_put_bud02.sh
@@ -5,12 +5,14 @@

 set -e  # Exit on any error

-# Configuration
+# Configuration - Using WSB's keys
 # SERVER_URL="http://localhost:9001"
 SERVER_URL="https://localhost:9443"
 UPLOAD_ENDPOINT="${SERVER_URL}/upload"
 TEST_FILE="test_blob_$(date +%s).txt"
 CLEANUP_FILES=()
+NOSTR_PRIVKEY="22cc83aa57928a2800234c939240c9a6f0f44a33ea3838a860ed38930b195afd"
+NOSTR_PUBKEY="8ff74724ed641b3c28e5a86d7c5cbc49c37638ace8c6c38935860e7a5eedde0e"

 # Colors for output
 RED='\033[0;31m'
@@ -128,22 +130,23 @@ calculate_hash() {

 # Generate nostr event
 generate_nostr_event() {
-    log_info "Generating kind 24242 nostr event with nak..."
-    
+    log_info "Generating kind 24242 nostr event with nak using Alice's private key..."
+
    # Calculate expiration time (1 hour from now)
    EXPIRATION=$(date -d '+1 hour' +%s)
-    
-    # Generate the event using nak
+
+    # Generate the event using nak with Alice's private key
    EVENT_JSON=$(nak event -k 24242 -c "" \
+        --sec "$NOSTR_PRIVKEY" \
        -t "t=upload" \
        -t "x=${HASH}" \
        -t "expiration=${EXPIRATION}")
-    
+
    if [[ -z "$EVENT_JSON" ]]; then
        log_error "Failed to generate nostr event"
        exit 1
    fi
-    
+
    log_success "Generated nostr event"
    echo "Event JSON: $EVENT_JSON"
 }
--- a/tests/file_put_production.sh
+++ b/tests/file_put_production.sh
@@ -126,22 +126,23 @@ calculate_hash() {

 # Generate nostr event
 generate_nostr_event() {
-    log_info "Generating kind 24242 nostr event with nak..."
-    
+    log_info "Generating kind 24242 nostr event with nak using WSB's private key..."
+
    # Calculate expiration time (1 hour from now)
    EXPIRATION=$(date -d '+1 hour' +%s)
-    
-    # Generate the event using nak
+
+    # Generate the event using nak with WSB's private key
    EVENT_JSON=$(nak event -k 24242 -c "" \
+        --sec "22cc83aa57928a2800234c939240c9a6f0f44a33ea3838a860ed38930b195afd" \
        -t "t=upload" \
        -t "x=${HASH}" \
        -t "expiration=${EXPIRATION}")
-    
+
    if [[ -z "$EVENT_JSON" ]]; then
        log_error "Failed to generate nostr event"
        exit 1
    fi
-    
+
    log_success "Generated nostr event"
    echo "Event JSON: $EVENT_JSON"
 }
--- a/tests/list_test_bud02.sh
+++ b/tests/list_test_bud02.sh
@@ -4,8 +4,8 @@
 # This script tests the blob listing functionality

 BASE_URL="http://localhost:9001"
-NOSTR_PRIVKEY="0000000000000000000000000000000000000000000000000000000000000001"
-NOSTR_PUBKEY="79be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798"
+NOSTR_PRIVKEY="22cc83aa57928a2800234c939240c9a6f0f44a33ea3838a860ed38930b195afd"
+NOSTR_PUBKEY="8ff74724ed641b3c28e5a86d7c5cbc49c37638ace8c6c38935860e7a5eedde0e"

 # Colors for output
 RED='\033[0;31m'
@@ -19,128 +19,117 @@ echo
 # Function to generate a Nostr event for list authorization
 generate_list_auth() {
    local content="$1"
-    local created_at=$(date +%s)
-    local expiration=$((created_at + 3600))  # 1 hour from now
-    
-    # Note: This is a placeholder - in real implementation, you'd use nostr tools
-    # to generate properly signed events. For now, we'll create the structure.
-    cat << EOF
-{
-  "id": "placeholder_id",
-  "pubkey": "$NOSTR_PUBKEY",
-  "kind": 24242,
-  "content": "$content",
-  "created_at": $created_at,
-  "tags": [
-    ["t", "list"],
-    ["expiration", "$expiration"]
-  ],
-  "sig": "placeholder_signature"
-}
-EOF
+
+    # Use nak to generate properly signed events with Alice's private key
+    nak event -k 24242 -c "$content" \
+        --sec "$NOSTR_PRIVKEY" \
+        -t "t=list" \
+        -t "expiration=$(( $(date +%s) + 3600 ))"
 }

 # Test 1: List blobs without authorization (should work if optional auth)
 echo -e "${YELLOW}Test 1: GET /list/<pubkey> without authorization${NC}"
+
 RESPONSE=$(curl -s -w "\nHTTP_STATUS:%{http_code}" "$BASE_URL/list/$NOSTR_PUBKEY")
 HTTP_STATUS=$(echo "$RESPONSE" | grep "HTTP_STATUS" | cut -d: -f2)
 BODY=$(echo "$RESPONSE" | sed '/HTTP_STATUS/d')

+echo "Using pubkey: $NOSTR_PUBKEY"
+echo "HTTP Status: $HTTP_STATUS"
+echo "Response: $BODY"
+echo
+
+# Test 2: List blobs with authorization
+echo -e "${YELLOW}Test 2: GET /list/<pubkey> with authorization${NC}"
+LIST_AUTH=$(generate_list_auth "List Blobs")
+AUTH_B64=$(echo "$LIST_AUTH" | base64 -w 0)
+RESPONSE=$(curl -s -w "\nHTTP_STATUS:%{http_code}" \
+    -H "Authorization: Nostr $AUTH_B64" \
+    "$BASE_URL/list/$NOSTR_PUBKEY")
+HTTP_STATUS=$(echo "$RESPONSE" | grep "HTTP_STATUS" | cut -d: -f2)
+BODY=$(echo "$RESPONSE" | sed '/HTTP_STATUS/d')
+
 echo "HTTP Status: $HTTP_STATUS"
 echo "Response: $BODY"
 echo

-# # Test 2: List blobs with authorization
-# echo -e "${YELLOW}Test 2: GET /list/<pubkey> with authorization${NC}"
-# LIST_AUTH=$(generate_list_auth "List Blobs")
-# AUTH_B64=$(echo "$LIST_AUTH" | base64 -w 0)
-# RESPONSE=$(curl -s -w "\nHTTP_STATUS:%{http_code}" \
-#     -H "Authorization: Nostr $AUTH_B64" \
-#     "$BASE_URL/list/$NOSTR_PUBKEY")
-# HTTP_STATUS=$(echo "$RESPONSE" | grep "HTTP_STATUS" | cut -d: -f2)
-# BODY=$(echo "$RESPONSE" | sed '/HTTP_STATUS/d')
+# Test 3: List blobs with since parameter
+echo -e "${YELLOW}Test 3: GET /list/<pubkey> with since parameter${NC}"
+SINCE_TIMESTAMP=$(($(date +%s) - 86400))  # 24 hours ago
+RESPONSE=$(curl -s -w "\nHTTP_STATUS:%{http_code}" \
+    "$BASE_URL/list/$NOSTR_PUBKEY?since=$SINCE_TIMESTAMP")
+HTTP_STATUS=$(echo "$RESPONSE" | grep "HTTP_STATUS" | cut -d: -f2)
+BODY=$(echo "$RESPONSE" | sed '/HTTP_STATUS/d')

-# echo "HTTP Status: $HTTP_STATUS"
-# echo "Response: $BODY"
-# echo
+echo "HTTP Status: $HTTP_STATUS"
+echo "Response: $BODY"
+echo

-# # Test 3: List blobs with since parameter
-# echo -e "${YELLOW}Test 3: GET /list/<pubkey> with since parameter${NC}"
-# SINCE_TIMESTAMP=$(($(date +%s) - 86400))  # 24 hours ago
-# RESPONSE=$(curl -s -w "\nHTTP_STATUS:%{http_code}" \
-#     "$BASE_URL/list/$NOSTR_PUBKEY?since=$SINCE_TIMESTAMP")
-# HTTP_STATUS=$(echo "$RESPONSE" | grep "HTTP_STATUS" | cut -d: -f2)
-# BODY=$(echo "$RESPONSE" | sed '/HTTP_STATUS/d')
+# Test 4: List blobs with until parameter
+echo -e "${YELLOW}Test 4: GET /list/<pubkey> with until parameter${NC}"
+UNTIL_TIMESTAMP=$(date +%s)  # now
+RESPONSE=$(curl -s -w "\nHTTP_STATUS:%{http_code}" \
+    "$BASE_URL/list/$NOSTR_PUBKEY?until=$UNTIL_TIMESTAMP")
+HTTP_STATUS=$(echo "$RESPONSE" | grep "HTTP_STATUS" | cut -d: -f2)
+BODY=$(echo "$RESPONSE" | sed '/HTTP_STATUS/d')

-# echo "HTTP Status: $HTTP_STATUS"
-# echo "Response: $BODY"
-# echo
+echo "HTTP Status: $HTTP_STATUS"
+echo "Response: $BODY"
+echo

-# # Test 4: List blobs with until parameter
-# echo -e "${YELLOW}Test 4: GET /list/<pubkey> with until parameter${NC}"
-# UNTIL_TIMESTAMP=$(date +%s)  # now
-# RESPONSE=$(curl -s -w "\nHTTP_STATUS:%{http_code}" \
-#     "$BASE_URL/list/$NOSTR_PUBKEY?until=$UNTIL_TIMESTAMP")
-# HTTP_STATUS=$(echo "$RESPONSE" | grep "HTTP_STATUS" | cut -d: -f2)
-# BODY=$(echo "$RESPONSE" | sed '/HTTP_STATUS/d')
+# Test 5: List blobs with both since and until parameters
+echo -e "${YELLOW}Test 5: GET /list/<pubkey> with since and until parameters${NC}"
+SINCE_TIMESTAMP=$(($(date +%s) - 86400))  # 24 hours ago
+UNTIL_TIMESTAMP=$(date +%s)  # now
+RESPONSE=$(curl -s -w "\nHTTP_STATUS:%{http_code}" \
+    "$BASE_URL/list/$NOSTR_PUBKEY?since=$SINCE_TIMESTAMP&until=$UNTIL_TIMESTAMP")
+HTTP_STATUS=$(echo "$RESPONSE" | grep "HTTP_STATUS" | cut -d: -f2)
+BODY=$(echo "$RESPONSE" | sed '/HTTP_STATUS/d')

-# echo "HTTP Status: $HTTP_STATUS"
-# echo "Response: $BODY"
-# echo
+echo "HTTP Status: $HTTP_STATUS"
+echo "Response: $BODY"
+echo

-# # Test 5: List blobs with both since and until parameters
-# echo -e "${YELLOW}Test 5: GET /list/<pubkey> with since and until parameters${NC}"
-# SINCE_TIMESTAMP=$(($(date +%s) - 86400))  # 24 hours ago
-# UNTIL_TIMESTAMP=$(date +%s)  # now
-# RESPONSE=$(curl -s -w "\nHTTP_STATUS:%{http_code}" \
-#     "$BASE_URL/list/$NOSTR_PUBKEY?since=$SINCE_TIMESTAMP&until=$UNTIL_TIMESTAMP")
-# HTTP_STATUS=$(echo "$RESPONSE" | grep "HTTP_STATUS" | cut -d: -f2)
-# BODY=$(echo "$RESPONSE" | sed '/HTTP_STATUS/d')
+# Test 6: List blobs for non-existent pubkey
+echo -e "${YELLOW}Test 6: GET /list/<nonexistent_pubkey>${NC}"
+FAKE_PUBKEY="1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef"
+RESPONSE=$(curl -s -w "\nHTTP_STATUS:%{http_code}" "$BASE_URL/list/$FAKE_PUBKEY")
+HTTP_STATUS=$(echo "$RESPONSE" | grep "HTTP_STATUS" | cut -d: -f2)
+BODY=$(echo "$RESPONSE" | sed '/HTTP_STATUS/d')

-# echo "HTTP Status: $HTTP_STATUS"
-# echo "Response: $BODY"
-# echo
+if [ "$HTTP_STATUS" = "200" ]; then
+    echo -e "${GREEN}✓ Correctly returned 200 with empty array${NC}"
+else
+    echo "HTTP Status: $HTTP_STATUS"
+fi
+echo "Response: $BODY"
+echo

-# # Test 6: List blobs for non-existent pubkey
-# echo -e "${YELLOW}Test 6: GET /list/<nonexistent_pubkey>${NC}"
-# FAKE_PUBKEY="1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef"
-# RESPONSE=$(curl -s -w "\nHTTP_STATUS:%{http_code}" "$BASE_URL/list/$FAKE_PUBKEY")
-# HTTP_STATUS=$(echo "$RESPONSE" | grep "HTTP_STATUS" | cut -d: -f2)
-# BODY=$(echo "$RESPONSE" | sed '/HTTP_STATUS/d')
+# Test 7: List blobs with invalid pubkey format
+echo -e "${YELLOW}Test 7: GET /list/<invalid_pubkey_format>${NC}"
+INVALID_PUBKEY="invalid_pubkey"
+RESPONSE=$(curl -s -w "\nHTTP_STATUS:%{http_code}" "$BASE_URL/list/$INVALID_PUBKEY")
+HTTP_STATUS=$(echo "$RESPONSE" | grep "HTTP_STATUS" | cut -d: -f2)
+BODY=$(echo "$RESPONSE" | sed '/HTTP_STATUS/d')

-# if [ "$HTTP_STATUS" = "200" ]; then
-#     echo -e "${GREEN}✓ Correctly returned 200 with empty array${NC}"
-# else
-#     echo "HTTP Status: $HTTP_STATUS"
-# fi
-# echo "Response: $BODY"
-# echo
+if [ "$HTTP_STATUS" = "400" ]; then
+    echo -e "${GREEN}✓ Correctly returned 400 for invalid pubkey format${NC}"
+else
+    echo "HTTP Status: $HTTP_STATUS"
+fi
+echo "Response: $BODY"
+echo

-# # Test 7: List blobs with invalid pubkey format
-# echo -e "${YELLOW}Test 7: GET /list/<invalid_pubkey_format>${NC}"
-# INVALID_PUBKEY="invalid_pubkey"
-# RESPONSE=$(curl -s -w "\nHTTP_STATUS:%{http_code}" "$BASE_URL/list/$INVALID_PUBKEY")
-# HTTP_STATUS=$(echo "$RESPONSE" | grep "HTTP_STATUS" | cut -d: -f2)
-# BODY=$(echo "$RESPONSE" | sed '/HTTP_STATUS/d')
+# Test 8: List blobs with invalid since/until parameters
+echo -e "${YELLOW}Test 8: GET /list/<pubkey> with invalid timestamp parameters${NC}"
+RESPONSE=$(curl -s -w "\nHTTP_STATUS:%{http_code}" \
+    "$BASE_URL/list/$NOSTR_PUBKEY?since=invalid&until=invalid")
+HTTP_STATUS=$(echo "$RESPONSE" | grep "HTTP_STATUS" | cut -d: -f2)
+BODY=$(echo "$RESPONSE" | sed '/HTTP_STATUS/d')

-# if [ "$HTTP_STATUS" = "400" ]; then
-#     echo -e "${GREEN}✓ Correctly returned 400 for invalid pubkey format${NC}"
-# else
-#     echo "HTTP Status: $HTTP_STATUS"
-# fi
-# echo "Response: $BODY"
-# echo
-
-# # Test 8: List blobs with invalid since/until parameters
-# echo -e "${YELLOW}Test 8: GET /list/<pubkey> with invalid timestamp parameters${NC}"
-# RESPONSE=$(curl -s -w "\nHTTP_STATUS:%{http_code}" \
-#     "$BASE_URL/list/$NOSTR_PUBKEY?since=invalid&until=invalid")
-# HTTP_STATUS=$(echo "$RESPONSE" | grep "HTTP_STATUS" | cut -d: -f2)
-# BODY=$(echo "$RESPONSE" | sed '/HTTP_STATUS/d')
-
-# echo "HTTP Status: $HTTP_STATUS"
-# echo "Response: $BODY"
-# echo
+echo "HTTP Status: $HTTP_STATUS"
+echo "Response: $BODY"
+echo

 # echo "=== List Tests Complete ==="
 # echo
--- a/tests/white_black_list_test.sh
+++ b/tests/white_black_list_test.sh
@@ -14,10 +14,10 @@ TESTS_PASSED=0
 TESTS_FAILED=0
 TOTAL_TESTS=0

-# Test keys for different scenarios
+# Test keys for different scenarios - Using WSB's keys for TEST_USER1
 # Generated using: nak key public <privkey>
-TEST_USER1_PRIVKEY="5c0c523f52a5b6fad39ed2403092df8cebc36318b39383bca6c00808626fab3a"
-TEST_USER1_PUBKEY="87d3561f19b74adbe8bf840682992466068830a9d8c36b4a0c99d36f826cb6cb"
+TEST_USER1_PRIVKEY="22cc83aa57928a2800234c939240c9a6f0f44a33ea3838a860ed38930b195afd"
+TEST_USER1_PUBKEY="8ff74724ed641b3c28e5a86d7c5cbc49c37638ace8c6c38935860e7a5eedde0e"

 TEST_USER2_PRIVKEY="182c3a5e3b7a1b7e4f5c6b7c8b4a5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b2"
 TEST_USER2_PUBKEY="0396b426090284a28294078dce53fe73791ab623c3fc46ab4409fea05109a6db"