comparing 5eaba51a37daf9812ba14b459d4f7eb88011e621 and main on dunkirk.sh/ctfd-alerts

+5 -5

.direnv/bin/nix-direnv-reload

···

       1
       1
        
       #!/usr/bin/env bash

     

       2
       2
        
       set -e

     

       3
       3
       -
       if [[ ! -d "/home/kierank/Projects/ctfd-alerts" ]]; then

     

       3
       3
       +
       if [[ ! -d "/home/kierank/code/personal/ctfd-alerts" ]]; then

     

       4
       4
        
         echo "Cannot find source directory; Did you move it?"

     

       5
       5
       -
         echo "(Looking for "/home/kierank/Projects/ctfd-alerts")"

     

       5
       5
       +
         echo "(Looking for "/home/kierank/code/personal/ctfd-alerts")"

     

       6
       6
        
         echo 'Cannot force reload with this script - use "direnv reload" manually and then try again'

     

       7
       7
        
         exit 1

     

       8
       8
        
       fi

     

       9
       9
        
       

     

       10
       10
        
       # rebuild the cache forcefully

     

       11
       11
       -
       _nix_direnv_force_reload=1 direnv exec "/home/kierank/Projects/ctfd-alerts" true

     

       11
       11
       +
       _nix_direnv_force_reload=1 direnv exec "/home/kierank/code/personal/ctfd-alerts" true

     

       12
       12
        
       

     

       13
       13
        
       # Update the mtime for .envrc.

     

       14
       14
        
       # This will cause direnv to reload again - but without re-building.

     

       15
       15
       -
       touch "/home/kierank/Projects/ctfd-alerts/.envrc"

     

       15
       15
       +
       touch "/home/kierank/code/personal/ctfd-alerts/.envrc"

     

       16
       16
        
       

     

       17
       17
        
       # Also update the timestamp of whatever profile_rc we have.

     

       18
       18
        
       # This makes sure that we know we are up to date.

     

       19
       19
       -
       touch -r "/home/kierank/Projects/ctfd-alerts/.envrc" "/home/kierank/Projects/ctfd-alerts/.direnv"/*.rc

     

       19
       19
       +
       touch -r "/home/kierank/code/personal/ctfd-alerts/.envrc" "/home/kierank/code/personal/ctfd-alerts/.direnv"/*.rc

.github/images/out.gif

This is a binary file and will not be displayed.

+75

.github/workflows/release.yml

···

       1
       1
       +
       name: Release

     

       2
       2
       +
       

     

       3
       3
       +
       on:

     

       4
       4
       +
         release:

     

       5
       5
       +
           types: [created]

     

       6
       6
       +
       

     

       7
       7
       +
       jobs:

     

       8
       8
       +
         build-and-upload:

     

       9
       9
       +
           runs-on: ubuntu-latest

     

       10
       10
       +
           permissions:

     

       11
       11
       +
             contents: write

     

       12
       12
       +
       

     

       13
       13
       +
           steps:

     

       14
       14
       +
             - name: Checkout repository

     

       15
       15
       +
               uses: actions/checkout@v4

     

       16
       16
       +
       

     

       17
       17
       +
             - name: Install Nix

     

       18
       18
       +
               uses: DeterminateSystems/nix-installer-action@main

     

       19
       19
       +
       

     

       20
       20
       +
             - name: Configure Nix cache

     

       21
       21
       +
               uses: DeterminateSystems/magic-nix-cache-action@main

     

       22
       22
       +
       

     

       23
       23
       +
             - name: Build for all platforms

     

       24
       24
       +
               run: |

     

       25
       25
       +
                 nix develop -c ctfd-alerts-build

     

       26
       26
       +
       

     

       27
       27
       +
             - name: Upload Linux AMD64 binary

     

       28
       28
       +
               uses: actions/upload-release-asset@v1

     

       29
       29
       +
               env:

     

       30
       30
       +
                 GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

     

       31
       31
       +
               with:

     

       32
       32
       +
                 upload_url: ${{ github.event.release.upload_url }}

     

       33
       33
       +
                 asset_path: ./bin/ctfd-alerts-linux-amd64

     

       34
       34
       +
                 asset_name: ctfd-alerts-linux-amd64

     

       35
       35
       +
                 asset_content_type: application/octet-stream

     

       36
       36
       +
       

     

       37
       37
       +
             - name: Upload Linux ARM64 binary

     

       38
       38
       +
               uses: actions/upload-release-asset@v1

     

       39
       39
       +
               env:

     

       40
       40
       +
                 GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

     

       41
       41
       +
               with:

     

       42
       42
       +
                 upload_url: ${{ github.event.release.upload_url }}

     

       43
       43
       +
                 asset_path: ./bin/ctfd-alerts-linux-arm64

     

       44
       44
       +
                 asset_name: ctfd-alerts-linux-arm64

     

       45
       45
       +
                 asset_content_type: application/octet-stream

     

       46
       46
       +
       

     

       47
       47
       +
             - name: Upload macOS AMD64 binary

     

       48
       48
       +
               uses: actions/upload-release-asset@v1

     

       49
       49
       +
               env:

     

       50
       50
       +
                 GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

     

       51
       51
       +
               with:

     

       52
       52
       +
                 upload_url: ${{ github.event.release.upload_url }}

     

       53
       53
       +
                 asset_path: ./bin/ctfd-alerts-darwin-amd64

     

       54
       54
       +
                 asset_name: ctfd-alerts-darwin-amd64

     

       55
       55
       +
                 asset_content_type: application/octet-stream

     

       56
       56
       +
       

     

       57
       57
       +
             - name: Upload macOS ARM64 binary

     

       58
       58
       +
               uses: actions/upload-release-asset@v1

     

       59
       59
       +
               env:

     

       60
       60
       +
                 GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

     

       61
       61
       +
               with:

     

       62
       62
       +
                 upload_url: ${{ github.event.release.upload_url }}

     

       63
       63
       +
                 asset_path: ./bin/ctfd-alerts-darwin-arm64

     

       64
       64
       +
                 asset_name: ctfd-alerts-darwin-arm64

     

       65
       65
       +
                 asset_content_type: application/octet-stream

     

       66
       66
       +
       

     

       67
       67
       +
             - name: Upload Windows AMD64 binary

     

       68
       68
       +
               uses: actions/upload-release-asset@v1

     

       69
       69
       +
               env:

     

       70
       70
       +
                 GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

     

       71
       71
       +
               with:

     

       72
       72
       +
                 upload_url: ${{ github.event.release.upload_url }}

     

       73
       73
       +
                 asset_path: ./bin/ctfd-alerts-windows-amd64.exe

     

       74
       74
       +
                 asset_name: ctfd-alerts-windows-amd64.exe

     

       75
       75
       +
                 asset_content_type: application/octet-stream

.gitignore

···

       3
       3
        
       .envrc

     

       4
       4
        
       config.toml

     

       5
       5
        
       cache.json

     

       6
       6
       +
       vendor

+25 -2

README.md

···

       2
       2
        
       

     

       3
       3
        
       Sends alerts for any arbitrary [CTFd](https://ctfd.io/) instance via [ntfy](https://ntfy.sh/)

     

       4
       4
        
       

     

       5
       5
       +
       ![vhs gif of the command being run](https://github.com/taciturnaxolotl/ctfd-alerts/blob/main/.github/images/out.gif?raw=true)

     

       6
       6
       +
       

     

       5
       7
        
       ## Install

     

       6
       8
        
       

     

       7
       9
        
       You can download a pre-built binary from the releases or you can use the following options

     
···

       12
       14
        
       # Go

     

       13
       15
        
       go install github.com/taciturnaxolotl/ctfd-alerts@latest

     

       14
       16
        
       ```

     

       17
       17
       +
       

     

       18
       18
       +
       If you need a systemd service file there is one in `ctfd-alerts.service`

     

       15
       19
        
       

     

       16
       20
        
       ### Nix

     

       17
       21
        
       

     
···

       25
       29
        
       ```nix

     

       26
       30
        
       # In your flake.nix

     

       27
       31
        
       {

     

       28
       28
       -
         inputs.akami.url = "github:taciturnaxolotl/ctfd-alerts";

     

       32
       32
       +
         inputs.ctfd-alerts.url = "github:taciturnaxolotl/ctfd-alerts";

     

       29
       33
        
       

     

       30
       30
       -
         outputs = { self, nixpkgs, akami, ... }: {

     

       34
       34
       +
         outputs = { self, nixpkgs, ctfd-alerts, ... }: {

     

       31
       35
        
           # Access the package as:

     

       32
       36
        
           # ctfd-alerts.packages.${system}.default

     

       33
       37
        
         };

     

       34
       38
        
       }

     

       39
       39
       +
       ```

     

       40
       40
       +
       

     

       41
       41
       +
       ## Config

     

       42
       42
       +
       

     

       43
       43
       +
       The config for the bot is quite simple. Create a `config.toml` file in the same directory as the binary (or link to the config location with `-c ./path/to/config/config.toml`) with the following format:

     

       44
       44
       +
       

     

       45
       45
       +
       ```toml

     

       46
       46
       +
       debug = true

     

       47
       47
       +
       interval = 100 # defaults to 300 if unset

     

       48
       48
       +
       user = "echo_kieran"

     

       49
       49
       +
       

     

       50
       50
       +
       [ctfd]

     

       51
       51
       +
       api_base = "http://163.11.237.79/api/v1"

     

       52
       52
       +
       api_key = "ctfd_10698fd44950bf7556bc3f5e1012832dae5bddcffb1fe82191d8dd3be3641393"

     

       53
       53
       +
       

     

       54
       54
       +
       [ntfy]

     

       55
       55
       +
       api_base = "https://ntfy.sh/"

     

       56
       56
       +
       acess_token = ""

     

       57
       57
       +
       topic = "youralert"

     

       35
       58
        
       ```

     

       36
       59
        
       

     

       37
       60
        
       Written in go. If you have any suggestions or issues feel free to open an issue on my [tangled](https://tangled.sh/@dunkirk.sh/ctfd-alerts) knot

+15

cassette.tape

···

       1
       1
       +
       Output .github/images/out.gif

     

       2
       2
       +
       Set Shell zsh

     

       3
       3
       +
       Set Width 1400

     

       4
       4
       +
       Set Height 900

     

       5
       5
       +
       Require ctfd-alerts-dev

     

       6
       6
       +
       Sleep 1s

     

       7
       7
       +
       Type "ctfd-alerts-dev"

     

       8
       8
       +
       Enter

     

       9
       9
       +
       Sleep 3s

     

       10
       10
       +
       Type "ctfd-alerts-dev status"

     

       11
       11
       +
       Enter

     

       12
       12
       +
       Sleep 4s

     

       13
       13
       +
       Type "ctfd-alerts-dev serve"

     

       14
       14
       +
       Enter

     

       15
       15
       +
       Sleep 5s

+249

cmd/serve/serve.go

···

       1
       1
       +
       package serve

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"encoding/json"

     

       5
       5
       +
       	"fmt"

     

       6
       6
       +
       	"log"

     

       7
       7
       +
       	"os"

     

       8
       8
       +
       	"os/signal"

     

       9
       9
       +
       	"path/filepath"

     

       10
       10
       +
       	"reflect"

     

       11
       11
       +
       	"syscall"

     

       12
       12
       +
       	"time"

     

       13
       13
       +
       

     

       14
       14
       +
       	"github.com/spf13/cobra"

     

       15
       15
       +
       	"github.com/taciturnaxolotl/ctfd-alerts/clients"

     

       16
       16
       +
       )

     

       17
       17
       +
       

     

       18
       18
       +
       type MonitorState struct {

     

       19
       19
       +
       	LastScoreboard *clients.ScoreboardResponse    `json:"last_scoreboard"`

     

       20
       20
       +
       	LastChallenges *clients.ChallengeListResponse `json:"last_challenges"`

     

       21
       21
       +
       	UserPosition   int                            `json:"user_position"`

     

       22
       22
       +
       }

     

       23
       23
       +
       

     

       24
       24
       +
       func getCacheFilePath() string {

     

       25
       25
       +
       	return filepath.Join(".", "cache.json")

     

       26
       26
       +
       }

     

       27
       27
       +
       

     

       28
       28
       +
       func loadStateFromCache() *MonitorState {

     

       29
       29
       +
       	cachePath := getCacheFilePath()

     

       30
       30
       +
       	data, err := os.ReadFile(cachePath)

     

       31
       31
       +
       	if err != nil {

     

       32
       32
       +
       		log.Printf("No cache file found or error reading cache: %v", err)

     

       33
       33
       +
       		return &MonitorState{}

     

       34
       34
       +
       	}

     

       35
       35
       +
       

     

       36
       36
       +
       	var state MonitorState

     

       37
       37
       +
       	if err := json.Unmarshal(data, &state); err != nil {

     

       38
       38
       +
       		log.Printf("Error parsing cache file: %v", err)

     

       39
       39
       +
       		return &MonitorState{}

     

       40
       40
       +
       	}

     

       41
       41
       +
       

     

       42
       42
       +
       	log.Printf("Loaded state from cache: %s", cachePath)

     

       43
       43
       +
       	return &state

     

       44
       44
       +
       }

     

       45
       45
       +
       

     

       46
       46
       +
       func saveStateToCache(state *MonitorState) error {

     

       47
       47
       +
       	cachePath := getCacheFilePath()

     

       48
       48
       +
       	data, err := json.MarshalIndent(state, "", "  ")

     

       49
       49
       +
       	if err != nil {

     

       50
       50
       +
       		return fmt.Errorf("error marshaling state: %v", err)

     

       51
       51
       +
       	}

     

       52
       52
       +
       

     

       53
       53
       +
       	if err := os.WriteFile(cachePath, data, 0644); err != nil {

     

       54
       54
       +
       		return fmt.Errorf("error writing cache file: %v", err)

     

       55
       55
       +
       	}

     

       56
       56
       +
       

     

       57
       57
       +
       	return nil

     

       58
       58
       +
       }

     

       59
       59
       +
       

     

       60
       60
       +
       var ServeCmd = &cobra.Command{

     

       61
       61
       +
       	Use:   "serve",

     

       62
       62
       +
       	Short: "Run monitoring server",

     

       63
       63
       +
       	Long:  "Continuously monitors CTFd for leaderboard changes and new challenges, sending alerts when events occur",

     

       64
       64
       +
       	Run:   runServer,

     

       65
       65
       +
       }

     

       66
       66
       +
       

     

       67
       67
       +
       func runServer(cmd *cobra.Command, args []string) {

     

       68
       68
       +
       	ctx := cmd.Context()

     

       69
       69
       +
       

     

       70
       70
       +
       	// Get CTFd client from context

     

       71
       71
       +
       	ctfdClient, ok := ctx.Value("ctfd_client").(clients.CTFdClient)

     

       72
       72
       +
       	if !ok {

     

       73
       73
       +
       		log.Fatal("CTFd client not found in context")

     

       74
       74
       +
       	}

     

       75
       75
       +
       

     

       76
       76
       +
       	// Get config from context

     

       77
       77
       +
       	config := ctx.Value("config")

     

       78
       78
       +
       

     

       79
       79
       +
       	// Use reflection to access config fields

     

       80
       80
       +
       	configValue := reflect.ValueOf(config).Elem()

     

       81
       81
       +
       	userField := configValue.FieldByName("User").String()

     

       82
       82
       +
       	intervalField := int(configValue.FieldByName("MonitorInterval").Int())

     

       83
       83
       +
       

     

       84
       84
       +
       	ntfyConfigField := configValue.FieldByName("NtfyConfig")

     

       85
       85
       +
       	ntfyTopic := ntfyConfigField.FieldByName("Topic").String()

     

       86
       86
       +
       	ntfyApiBase := ntfyConfigField.FieldByName("ApiBase").String()

     

       87
       87
       +
       	ntfyAccessToken := ntfyConfigField.FieldByName("AccessToken").String()

     

       88
       88
       +
       

     

       89
       89
       +
       	// Create ntfy client

     

       90
       90
       +
       	ntfyClient := clients.NewNtfyClient(ntfyTopic, ntfyApiBase, ntfyAccessToken)

     

       91
       91
       +
       

     

       92
       92
       +
       	// Initialize monitoring state - try to load from cache first

     

       93
       93
       +
       	state := loadStateFromCache()

     

       94
       94
       +
       

     

       95
       95
       +
       	// If cache is empty or we want fresh data, get initial state from API

     

       96
       96
       +
       	if state.LastScoreboard == nil || state.LastChallenges == nil {

     

       97
       97
       +
       		log.Println("No cached state found, fetching initial state from API...")

     

       98
       98
       +
       		if err := updateState(ctfdClient, state, userField); err != nil {

     

       99
       99
       +
       			log.Printf("Error getting initial state: %v", err)

     

       100
       100
       +
       		}

     

       101
       101
       +
       	} else {

     

       102
       102
       +
       		log.Println("Using cached state")

     

       103
       103
       +
       		// Still update user position in case it changed

     

       104
       104
       +
       		if state.LastScoreboard != nil {

     

       105
       105
       +
       			state.UserPosition = findUserPosition(state.LastScoreboard, userField)

     

       106
       106
       +
       		}

     

       107
       107
       +
       	}

     

       108
       108
       +
       

     

       109
       109
       +
       	log.Printf("Starting monitoring server (interval: %d seconds)", intervalField)

     

       110
       110
       +
       	log.Printf("Monitoring user: %s", userField)

     

       111
       111
       +
       

     

       112
       112
       +
       	// Set up signal handling for graceful shutdown

     

       113
       113
       +
       	sigChan := make(chan os.Signal, 1)

     

       114
       114
       +
       	signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM)

     

       115
       115
       +
       

     

       116
       116
       +
       	// Main monitoring loop

     

       117
       117
       +
       	ticker := time.NewTicker(time.Duration(intervalField) * time.Second)

     

       118
       118
       +
       	defer ticker.Stop()

     

       119
       119
       +
       

     

       120
       120
       +
       	for {

     

       121
       121
       +
       		select {

     

       122
       122
       +
       		case <-ticker.C:

     

       123
       123
       +
       			if err := monitorAndAlert(ctfdClient, ntfyClient, state, userField); err != nil {

     

       124
       124
       +
       				log.Printf("Error during monitoring: %v", err)

     

       125
       125
       +
       			} else {

     

       126
       126
       +
       				// Save state to cache after successful monitoring

     

       127
       127
       +
       				if err := saveStateToCache(state); err != nil {

     

       128
       128
       +
       					log.Printf("Error saving state to cache: %v", err)

     

       129
       129
       +
       				}

     

       130
       130
       +
       			}

     

       131
       131
       +
       		case <-sigChan:

     

       132
       132
       +
       			log.Println("Received shutdown signal, saving state and stopping server...")

     

       133
       133
       +
       			if err := saveStateToCache(state); err != nil {

     

       134
       134
       +
       				log.Printf("Error saving final state to cache: %v", err)

     

       135
       135
       +
       			} else {

     

       136
       136
       +
       				log.Printf("State saved to cache: %s", getCacheFilePath())

     

       137
       137
       +
       			}

     

       138
       138
       +
       			return

     

       139
       139
       +
       		}

     

       140
       140
       +
       	}

     

       141
       141
       +
       }

     

       142
       142
       +
       

     

       143
       143
       +
       func updateState(client clients.CTFdClient, state *MonitorState, username string) error {

     

       144
       144
       +
       	// Get scoreboard

     

       145
       145
       +
       	scoreboard, err := client.GetScoreboard()

     

       146
       146
       +
       	if err != nil {

     

       147
       147
       +
       		return fmt.Errorf("failed to get scoreboard: %v", err)

     

       148
       148
       +
       	}

     

       149
       149
       +
       	state.LastScoreboard = scoreboard

     

       150
       150
       +
       

     

       151
       151
       +
       	// Find user position

     

       152
       152
       +
       	state.UserPosition = findUserPosition(scoreboard, username)

     

       153
       153
       +
       

     

       154
       154
       +
       	// Get challenges

     

       155
       155
       +
       	challenges, err := client.GetChallengeList()

     

       156
       156
       +
       	if err != nil {

     

       157
       157
       +
       		return fmt.Errorf("failed to get challenges: %v", err)

     

       158
       158
       +
       	}

     

       159
       159
       +
       	state.LastChallenges = challenges

     

       160
       160
       +
       

     

       161
       161
       +
       	return nil

     

       162
       162
       +
       }

     

       163
       163
       +
       

     

       164
       164
       +
       func monitorAndAlert(client clients.CTFdClient, ntfy *clients.NtfyClient, state *MonitorState, username string) error {

     

       165
       165
       +
       	// Get current scoreboard

     

       166
       166
       +
       	currentScoreboard, err := client.GetScoreboard()

     

       167
       167
       +
       	if err != nil {

     

       168
       168
       +
       		return fmt.Errorf("failed to get scoreboard: %v", err)

     

       169
       169
       +
       	}

     

       170
       170
       +
       

     

       171
       171
       +
       	// Get current challenges

     

       172
       172
       +
       	currentChallenges, err := client.GetChallengeList()

     

       173
       173
       +
       	if err != nil {

     

       174
       174
       +
       		return fmt.Errorf("failed to get challenges: %v", err)

     

       175
       175
       +
       	}

     

       176
       176
       +
       

     

       177
       177
       +
       	// Check for leaderboard bypass

     

       178
       178
       +
       	if state.LastScoreboard != nil {

     

       179
       179
       +
       		currentPosition := findUserPosition(currentScoreboard, username)

     

       180
       180
       +
       		if currentPosition > state.UserPosition && state.UserPosition > 0 {

     

       181
       181
       +
       			// User was bypassed

     

       182
       182
       +
       			msg := ntfy.NewMessage(fmt.Sprintf("🏆 You've been bypassed on the leaderboard! New position: #%d (was #%d)", currentPosition, state.UserPosition))

     

       183
       183
       +
       			msg.Title = "CTFd Leaderboard Alert"

     

       184
       184
       +
       			msg.Tags = []string{"warning", "leaderboard"}

     

       185
       185
       +
       			msg.Priority = 4

     

       186
       186
       +
       

     

       187
       187
       +
       			if err := ntfy.SendMessage(msg); err != nil {

     

       188
       188
       +
       				log.Printf("Failed to send bypass alert: %v", err)

     

       189
       189
       +
       			} else {

     

       190
       190
       +
       				log.Printf("Sent bypass alert: %s -> %d", username, currentPosition)

     

       191
       191
       +
       			}

     

       192
       192
       +
       		}

     

       193
       193
       +
       		state.UserPosition = currentPosition

     

       194
       194
       +
       	}

     

       195
       195
       +
       

     

       196
       196
       +
       	// Check for new challenges

     

       197
       197
       +
       	if state.LastChallenges != nil {

     

       198
       198
       +
       		newChallenges := findNewChallenges(state.LastChallenges, currentChallenges)

     

       199
       199
       +
       		for _, challenge := range newChallenges {

     

       200
       200
       +
       			msg := ntfy.NewMessage(fmt.Sprintf("🎯 New challenge released: %s (%s) - %d points", challenge.Name, challenge.Category, challenge.Value))

     

       201
       201
       +
       			msg.Title = "New CTFd Challenge"

     

       202
       202
       +
       			msg.Tags = []string{"challenge", "new"}

     

       203
       203
       +
       			msg.Priority = 3

     

       204
       204
       +
       

     

       205
       205
       +
       			if err := ntfy.SendMessage(msg); err != nil {

     

       206
       206
       +
       				log.Printf("Failed to send new challenge alert: %v", err)

     

       207
       207
       +
       			} else {

     

       208
       208
       +
       				log.Printf("Sent new challenge alert: %s", challenge.Name)

     

       209
       209
       +
       			}

     

       210
       210
       +
       		}

     

       211
       211
       +
       	}

     

       212
       212
       +
       

     

       213
       213
       +
       	// Update state

     

       214
       214
       +
       	state.LastScoreboard = currentScoreboard

     

       215
       215
       +
       	state.LastChallenges = currentChallenges

     

       216
       216
       +
       

     

       217
       217
       +
       	return nil

     

       218
       218
       +
       }

     

       219
       219
       +
       

     

       220
       220
       +
       func findUserPosition(scoreboard *clients.ScoreboardResponse, username string) int {

     

       221
       221
       +
       	for _, team := range scoreboard.Data {

     

       222
       222
       +
       		if team.Name == username {

     

       223
       223
       +
       			return team.Position

     

       224
       224
       +
       		}

     

       225
       225
       +
       		// Also check team members

     

       226
       226
       +
       		for _, member := range team.Members {

     

       227
       227
       +
       			if member.Name == username {

     

       228
       228
       +
       				return team.Position

     

       229
       229
       +
       			}

     

       230
       230
       +
       		}

     

       231
       231
       +
       	}

     

       232
       232
       +
       	return 0 // User not found

     

       233
       233
       +
       }

     

       234
       234
       +
       

     

       235
       235
       +
       func findNewChallenges(oldChallenges, newChallenges *clients.ChallengeListResponse) []clients.Challenge {

     

       236
       236
       +
       	oldMap := make(map[int]bool)

     

       237
       237
       +
       	for _, challenge := range oldChallenges.Data {

     

       238
       238
       +
       		oldMap[challenge.ID] = true

     

       239
       239
       +
       	}

     

       240
       240
       +
       

     

       241
       241
       +
       	var newOnes []clients.Challenge

     

       242
       242
       +
       	for _, challenge := range newChallenges.Data {

     

       243
       243
       +
       		if !oldMap[challenge.ID] {

     

       244
       244
       +
       			newOnes = append(newOnes, challenge)

     

       245
       245
       +
       		}

     

       246
       246
       +
       	}

     

       247
       247
       +
       

     

       248
       248
       +
       	return newOnes

     

       249
       249
       +
       }

-250

cmd/server/server.go

···

       1
       1
       -
       package server

     

       2
       2
       -
       

     

       3
       3
       -
       import (

     

       4
       4
       -
       	"encoding/json"

     

       5
       5
       -
       	"fmt"

     

       6
       6
       -
       	"log"

     

       7
       7
       -
       	"os"

     

       8
       8
       -
       	"os/signal"

     

       9
       9
       -
       	"path/filepath"

     

       10
       10
       -
       	"reflect"

     

       11
       11
       -
       	"syscall"

     

       12
       12
       -
       	"time"

     

       13
       13
       -
       

     

       14
       14
       -
       	"github.com/spf13/cobra"

     

       15
       15
       -
       	"github.com/taciturnaxolotl/ctfd-alerts/clients"

     

       16
       16
       -
       )

     

       17
       17
       -
       

     

       18
       18
       -
       type MonitorState struct {

     

       19
       19
       -
       	LastScoreboard *clients.ScoreboardResponse    `json:"last_scoreboard"`

     

       20
       20
       -
       	LastChallenges *clients.ChallengeListResponse `json:"last_challenges"`

     

       21
       21
       -
       	UserPosition   int                            `json:"user_position"`

     

       22
       22
       -
       }

     

       23
       23
       -
       

     

       24
       24
       -
       func getCacheFilePath() string {

     

       25
       25
       -
       	return filepath.Join(".", "cache.json")

     

       26
       26
       -
       }

     

       27
       27
       -
       

     

       28
       28
       -
       func loadStateFromCache() *MonitorState {

     

       29
       29
       -
       	cachePath := getCacheFilePath()

     

       30
       30
       -
       	data, err := os.ReadFile(cachePath)

     

       31
       31
       -
       	if err != nil {

     

       32
       32
       -
       		log.Printf("No cache file found or error reading cache: %v", err)

     

       33
       33
       -
       		return &MonitorState{}

     

       34
       34
       -
       	}

     

       35
       35
       -
       

     

       36
       36
       -
       	var state MonitorState

     

       37
       37
       -
       	if err := json.Unmarshal(data, &state); err != nil {

     

       38
       38
       -
       		log.Printf("Error parsing cache file: %v", err)

     

       39
       39
       -
       		return &MonitorState{}

     

       40
       40
       -
       	}

     

       41
       41
       -
       

     

       42
       42
       -
       	log.Printf("Loaded state from cache: %s", cachePath)

     

       43
       43
       -
       	return &state

     

       44
       44
       -
       }

     

       45
       45
       -
       

     

       46
       46
       -
       func saveStateToCache(state *MonitorState) error {

     

       47
       47
       -
       	cachePath := getCacheFilePath()

     

       48
       48
       -
       	data, err := json.MarshalIndent(state, "", "  ")

     

       49
       49
       -
       	if err != nil {

     

       50
       50
       -
       		return fmt.Errorf("error marshaling state: %v", err)

     

       51
       51
       -
       	}

     

       52
       52
       -
       

     

       53
       53
       -
       	if err := os.WriteFile(cachePath, data, 0644); err != nil {

     

       54
       54
       -
       		return fmt.Errorf("error writing cache file: %v", err)

     

       55
       55
       -
       	}

     

       56
       56
       -
       

     

       57
       57
       -
       	return nil

     

       58
       58
       -
       }

     

       59
       59
       -
       

     

       60
       60
       -
       // ServerCmd represents the server command

     

       61
       61
       -
       var ServerCmd = &cobra.Command{

     

       62
       62
       -
       	Use:   "server",

     

       63
       63
       -
       	Short: "Run monitoring server",

     

       64
       64
       -
       	Long:  "Continuously monitors CTFd for leaderboard changes and new challenges, sending alerts when events occur",

     

       65
       65
       -
       	Run:   runServer,

     

       66
       66
       -
       }

     

       67
       67
       -
       

     

       68
       68
       -
       func runServer(cmd *cobra.Command, args []string) {

     

       69
       69
       -
       	ctx := cmd.Context()

     

       70
       70
       -
       

     

       71
       71
       -
       	// Get CTFd client from context

     

       72
       72
       -
       	ctfdClient, ok := ctx.Value("ctfd_client").(clients.CTFdClient)

     

       73
       73
       -
       	if !ok {

     

       74
       74
       -
       		log.Fatal("CTFd client not found in context")

     

       75
       75
       -
       	}

     

       76
       76
       -
       

     

       77
       77
       -
       	// Get config from context

     

       78
       78
       -
       	config := ctx.Value("config")

     

       79
       79
       -
       

     

       80
       80
       -
       	// Use reflection to access config fields

     

       81
       81
       -
       	configValue := reflect.ValueOf(config).Elem()

     

       82
       82
       -
       	userField := configValue.FieldByName("User").String()

     

       83
       83
       -
       	intervalField := int(configValue.FieldByName("MonitorInterval").Int())

     

       84
       84
       -
       

     

       85
       85
       -
       	ntfyConfigField := configValue.FieldByName("NtfyConfig")

     

       86
       86
       -
       	ntfyTopic := ntfyConfigField.FieldByName("Topic").String()

     

       87
       87
       -
       	ntfyApiBase := ntfyConfigField.FieldByName("ApiBase").String()

     

       88
       88
       -
       	ntfyAccessToken := ntfyConfigField.FieldByName("AccessToken").String()

     

       89
       89
       -
       

     

       90
       90
       -
       	// Create ntfy client

     

       91
       91
       -
       	ntfyClient := clients.NewNtfyClient(ntfyTopic, ntfyApiBase, ntfyAccessToken)

     

       92
       92
       -
       

     

       93
       93
       -
       	// Initialize monitoring state - try to load from cache first

     

       94
       94
       -
       	state := loadStateFromCache()

     

       95
       95
       -
       

     

       96
       96
       -
       	// If cache is empty or we want fresh data, get initial state from API

     

       97
       97
       -
       	if state.LastScoreboard == nil || state.LastChallenges == nil {

     

       98
       98
       -
       		log.Println("No cached state found, fetching initial state from API...")

     

       99
       99
       -
       		if err := updateState(ctfdClient, state, userField); err != nil {

     

       100
       100
       -
       			log.Printf("Error getting initial state: %v", err)

     

       101
       101
       -
       		}

     

       102
       102
       -
       	} else {

     

       103
       103
       -
       		log.Println("Using cached state")

     

       104
       104
       -
       		// Still update user position in case it changed

     

       105
       105
       -
       		if state.LastScoreboard != nil {

     

       106
       106
       -
       			state.UserPosition = findUserPosition(state.LastScoreboard, userField)

     

       107
       107
       -
       		}

     

       108
       108
       -
       	}

     

       109
       109
       -
       

     

       110
       110
       -
       	log.Printf("Starting monitoring server (interval: %d seconds)", intervalField)

     

       111
       111
       -
       	log.Printf("Monitoring user: %s", userField)

     

       112
       112
       -
       

     

       113
       113
       -
       	// Set up signal handling for graceful shutdown

     

       114
       114
       -
       	sigChan := make(chan os.Signal, 1)

     

       115
       115
       -
       	signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM)

     

       116
       116
       -
       

     

       117
       117
       -
       	// Main monitoring loop

     

       118
       118
       -
       	ticker := time.NewTicker(time.Duration(intervalField) * time.Second)

     

       119
       119
       -
       	defer ticker.Stop()

     

       120
       120
       -
       

     

       121
       121
       -
       	for {

     

       122
       122
       -
       		select {

     

       123
       123
       -
       		case <-ticker.C:

     

       124
       124
       -
       			if err := monitorAndAlert(ctfdClient, ntfyClient, state, userField); err != nil {

     

       125
       125
       -
       				log.Printf("Error during monitoring: %v", err)

     

       126
       126
       -
       			} else {

     

       127
       127
       -
       				// Save state to cache after successful monitoring

     

       128
       128
       -
       				if err := saveStateToCache(state); err != nil {

     

       129
       129
       -
       					log.Printf("Error saving state to cache: %v", err)

     

       130
       130
       -
       				}

     

       131
       131
       -
       			}

     

       132
       132
       -
       		case <-sigChan:

     

       133
       133
       -
       			log.Println("Received shutdown signal, saving state and stopping server...")

     

       134
       134
       -
       			if err := saveStateToCache(state); err != nil {

     

       135
       135
       -
       				log.Printf("Error saving final state to cache: %v", err)

     

       136
       136
       -
       			} else {

     

       137
       137
       -
       				log.Printf("State saved to cache: %s", getCacheFilePath())

     

       138
       138
       -
       			}

     

       139
       139
       -
       			return

     

       140
       140
       -
       		}

     

       141
       141
       -
       	}

     

       142
       142
       -
       }

     

       143
       143
       -
       

     

       144
       144
       -
       func updateState(client clients.CTFdClient, state *MonitorState, username string) error {

     

       145
       145
       -
       	// Get scoreboard

     

       146
       146
       -
       	scoreboard, err := client.GetScoreboard()

     

       147
       147
       -
       	if err != nil {

     

       148
       148
       -
       		return fmt.Errorf("failed to get scoreboard: %v", err)

     

       149
       149
       -
       	}

     

       150
       150
       -
       	state.LastScoreboard = scoreboard

     

       151
       151
       -
       

     

       152
       152
       -
       	// Find user position

     

       153
       153
       -
       	state.UserPosition = findUserPosition(scoreboard, username)

     

       154
       154
       -
       

     

       155
       155
       -
       	// Get challenges

     

       156
       156
       -
       	challenges, err := client.GetChallengeList()

     

       157
       157
       -
       	if err != nil {

     

       158
       158
       -
       		return fmt.Errorf("failed to get challenges: %v", err)

     

       159
       159
       -
       	}

     

       160
       160
       -
       	state.LastChallenges = challenges

     

       161
       161
       -
       

     

       162
       162
       -
       	return nil

     

       163
       163
       -
       }

     

       164
       164
       -
       

     

       165
       165
       -
       func monitorAndAlert(client clients.CTFdClient, ntfy *clients.NtfyClient, state *MonitorState, username string) error {

     

       166
       166
       -
       	// Get current scoreboard

     

       167
       167
       -
       	currentScoreboard, err := client.GetScoreboard()

     

       168
       168
       -
       	if err != nil {

     

       169
       169
       -
       		return fmt.Errorf("failed to get scoreboard: %v", err)

     

       170
       170
       -
       	}

     

       171
       171
       -
       

     

       172
       172
       -
       	// Get current challenges

     

       173
       173
       -
       	currentChallenges, err := client.GetChallengeList()

     

       174
       174
       -
       	if err != nil {

     

       175
       175
       -
       		return fmt.Errorf("failed to get challenges: %v", err)

     

       176
       176
       -
       	}

     

       177
       177
       -
       

     

       178
       178
       -
       	// Check for leaderboard bypass

     

       179
       179
       -
       	if state.LastScoreboard != nil {

     

       180
       180
       -
       		currentPosition := findUserPosition(currentScoreboard, username)

     

       181
       181
       -
       		if currentPosition > state.UserPosition && state.UserPosition > 0 {

     

       182
       182
       -
       			// User was bypassed

     

       183
       183
       -
       			msg := ntfy.NewMessage(fmt.Sprintf("🏆 You've been bypassed on the leaderboard! New position: #%d (was #%d)", currentPosition, state.UserPosition))

     

       184
       184
       -
       			msg.Title = "CTFd Leaderboard Alert"

     

       185
       185
       -
       			msg.Tags = []string{"warning", "leaderboard"}

     

       186
       186
       -
       			msg.Priority = 4

     

       187
       187
       -
       

     

       188
       188
       -
       			if err := ntfy.SendMessage(msg); err != nil {

     

       189
       189
       -
       				log.Printf("Failed to send bypass alert: %v", err)

     

       190
       190
       -
       			} else {

     

       191
       191
       -
       				log.Printf("Sent bypass alert: %s -> %d", username, currentPosition)

     

       192
       192
       -
       			}

     

       193
       193
       -
       		}

     

       194
       194
       -
       		state.UserPosition = currentPosition

     

       195
       195
       -
       	}

     

       196
       196
       -
       

     

       197
       197
       -
       	// Check for new challenges

     

       198
       198
       -
       	if state.LastChallenges != nil {

     

       199
       199
       -
       		newChallenges := findNewChallenges(state.LastChallenges, currentChallenges)

     

       200
       200
       -
       		for _, challenge := range newChallenges {

     

       201
       201
       -
       			msg := ntfy.NewMessage(fmt.Sprintf("🎯 New challenge released: %s (%s) - %d points", challenge.Name, challenge.Category, challenge.Value))

     

       202
       202
       -
       			msg.Title = "New CTFd Challenge"

     

       203
       203
       -
       			msg.Tags = []string{"challenge", "new"}

     

       204
       204
       -
       			msg.Priority = 3

     

       205
       205
       -
       

     

       206
       206
       -
       			if err := ntfy.SendMessage(msg); err != nil {

     

       207
       207
       -
       				log.Printf("Failed to send new challenge alert: %v", err)

     

       208
       208
       -
       			} else {

     

       209
       209
       -
       				log.Printf("Sent new challenge alert: %s", challenge.Name)

     

       210
       210
       -
       			}

     

       211
       211
       -
       		}

     

       212
       212
       -
       	}

     

       213
       213
       -
       

     

       214
       214
       -
       	// Update state

     

       215
       215
       -
       	state.LastScoreboard = currentScoreboard

     

       216
       216
       -
       	state.LastChallenges = currentChallenges

     

       217
       217
       -
       

     

       218
       218
       -
       	return nil

     

       219
       219
       -
       }

     

       220
       220
       -
       

     

       221
       221
       -
       func findUserPosition(scoreboard *clients.ScoreboardResponse, username string) int {

     

       222
       222
       -
       	for _, team := range scoreboard.Data {

     

       223
       223
       -
       		if team.Name == username {

     

       224
       224
       -
       			return team.Position

     

       225
       225
       -
       		}

     

       226
       226
       -
       		// Also check team members

     

       227
       227
       -
       		for _, member := range team.Members {

     

       228
       228
       -
       			if member.Name == username {

     

       229
       229
       -
       				return team.Position

     

       230
       230
       -
       			}

     

       231
       231
       -
       		}

     

       232
       232
       -
       	}

     

       233
       233
       -
       	return 0 // User not found

     

       234
       234
       -
       }

     

       235
       235
       -
       

     

       236
       236
       -
       func findNewChallenges(oldChallenges, newChallenges *clients.ChallengeListResponse) []clients.Challenge {

     

       237
       237
       -
       	oldMap := make(map[int]bool)

     

       238
       238
       -
       	for _, challenge := range oldChallenges.Data {

     

       239
       239
       -
       		oldMap[challenge.ID] = true

     

       240
       240
       -
       	}

     

       241
       241
       -
       

     

       242
       242
       -
       	var newOnes []clients.Challenge

     

       243
       243
       -
       	for _, challenge := range newChallenges.Data {

     

       244
       244
       -
       		if !oldMap[challenge.ID] {

     

       245
       245
       -
       			newOnes = append(newOnes, challenge)

     

       246
       246
       -
       		}

     

       247
       247
       -
       	}

     

       248
       248
       -
       

     

       249
       249
       -
       	return newOnes

     

       250
       250
       -
       }

-12

config.toml

···

       1
       1
       -
       debug = true

     

       2
       2
       -
       interval = 100

     

       3
       3
       -
       user = "echo_kieran"

     

       4
       4
       -
       

     

       5
       5
       -
       [ctfd]

     

       6
       6
       -
       api_base = "http://163.11.237.79/api/v1"

     

       7
       7
       -
       api_key = "ctfd_10698fd44950bf7556bc3f5e1012832dae5bddcffb1fe82191d8dd3be3641393"

     

       8
       8
       -
       

     

       9
       9
       -
       [ntfy]

     

       10
       10
       -
       api_base = "https://ntfy.sh/"

     

       11
       11
       -
       acess_token = ""

     

       12
       12
       -
       topic = "cugencyber_ctfd"

+16

ctfd-alerts.service

···

       1
       1
       +
       [Unit]

     

       2
       2
       +
       Description=ctfd alerts server

     

       3
       3
       +
       After=network.target

     

       4
       4
       +
       

     

       5
       5
       +
       

     

       6
       6
       +
       [Service]

     

       7
       7
       +
       ExecStart=/home/pi/go/bin/ctfd-alerts serve

     

       8
       8
       +
       Restart=always

     

       9
       9
       +
       User=pi

     

       10
       10
       +
       WorkingDirectory=/home/pi/ctfd-alerts

     

       11
       11
       +
       StandardOutput=journal

     

       12
       12
       +
       StandardError=journal

     

       13
       13
       +
       LimitNOFILE=65536

     

       14
       14
       +
       

     

       15
       15
       +
       [Install]

     

       16
       16
       +
       WantedBy=multi-user.target

+1 -1

flake.nix

···

       21
       21
        
             packages = forAllSystems ({ pkgs }: {

     

       22
       22
        
               default = pkgs.buildGoModule {

     

       23
       23
        
                 pname = "ctfd-alerts";

     

       24
       24
       -
                 version = "0.0.1";

     

       24
       24
       +
                 version = "0.1.0";

     

       25
       25
        
                 subPackages = [ "." ];  # Build from root directory

     

       26
       26
        
                 src = self;

     

       27
       27
        
                 vendorHash = null;

+2 -7

go.mod

···

       4
       4
        
       

     

       5
       5
        
       require (

     

       6
       6
        
       	github.com/charmbracelet/fang v0.2.0

     

       7
       7
       +
       	github.com/charmbracelet/lipgloss v1.1.0

     

       7
       8
        
       	github.com/pelletier/go-toml/v2 v2.2.4

     

       8
       9
        
       	github.com/spf13/cobra v1.9.1

     

       9
       10
        
       )

     

       10
       11
        
       

     

       11
       12
        
       require (

     

       12
       13
        
       	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect

     

       13
       13
       -
       	github.com/charmbracelet/bubbles v0.21.0 // indirect

     

       14
       14
       -
       	github.com/charmbracelet/bubbletea v1.3.4 // indirect

     

       15
       14
        
       	github.com/charmbracelet/colorprofile v0.3.1 // indirect

     

       16
       16
       -
       	github.com/charmbracelet/lipgloss v1.1.0 // indirect

     

       17
       15
        
       	github.com/charmbracelet/lipgloss/v2 v2.0.0-beta1 // indirect

     

       18
       16
        
       	github.com/charmbracelet/x/ansi v0.9.3 // indirect

     

       19
       17
        
       	github.com/charmbracelet/x/cellbuf v0.0.13 // indirect

     

       20
       18
        
       	github.com/charmbracelet/x/exp/charmtone v0.0.0-20250623112707-45752038d08d // indirect

     

       19
       19
       +
       	github.com/charmbracelet/x/exp/golden v0.0.0-20241011142426-46044092ad91 // indirect

     

       21
       20
        
       	github.com/charmbracelet/x/term v0.2.1 // indirect

     

       22
       22
       -
       	github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect

     

       23
       21
        
       	github.com/inconshreveable/mousetrap v1.1.0 // indirect

     

       24
       22
        
       	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect

     

       25
       23
        
       	github.com/mattn/go-isatty v0.0.20 // indirect

     

       26
       26
       -
       	github.com/mattn/go-localereader v0.0.1 // indirect

     

       27
       24
        
       	github.com/mattn/go-runewidth v0.0.16 // indirect

     

       28
       28
       -
       	github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect

     

       29
       25
        
       	github.com/muesli/cancelreader v0.2.2 // indirect

     

       30
       26
        
       	github.com/muesli/mango v0.2.0 // indirect

     

       31
       27
        
       	github.com/muesli/mango-cobra v1.2.0 // indirect

     
···

       35
       31
        
       	github.com/rivo/uniseg v0.4.7 // indirect

     

       36
       32
        
       	github.com/spf13/pflag v1.0.6 // indirect

     

       37
       33
        
       	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect

     

       38
       38
       -
       	golang.org/x/sync v0.15.0 // indirect

     

       39
       34
        
       	golang.org/x/sys v0.33.0 // indirect

     

       40
       35
        
       	golang.org/x/text v0.26.0 // indirect

     

       41
       36
        
       )

+1 -15

go.sum

···

       2
       2
        
       github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=

     

       3
       3
        
       github.com/aymanbagabas/go-udiff v0.2.0 h1:TK0fH4MteXUDspT88n8CKzvK0X9O2xu9yQjWpi6yML8=

     

       4
       4
        
       github.com/aymanbagabas/go-udiff v0.2.0/go.mod h1:RE4Ex0qsGkTAJoQdQQCA0uG+nAzJO/pI/QwceO5fgrA=

     

       5
       5
       -
       github.com/charmbracelet/bubbles v0.21.0 h1:9TdC97SdRVg/1aaXNVWfFH3nnLAwOXr8Fn6u6mfQdFs=

     

       6
       6
       -
       github.com/charmbracelet/bubbles v0.21.0/go.mod h1:HF+v6QUR4HkEpz62dx7ym2xc71/KBHg+zKwJtMw+qtg=

     

       7
       7
       -
       github.com/charmbracelet/bubbletea v1.3.4 h1:kCg7B+jSCFPLYRA52SDZjr51kG/fMUEoPoZrkaDHyoI=

     

       8
       8
       -
       github.com/charmbracelet/bubbletea v1.3.4/go.mod h1:dtcUCyCGEX3g9tosuYiut3MXgY/Jsv9nKVdibKKRRXo=

     

       9
       5
        
       github.com/charmbracelet/colorprofile v0.3.1 h1:k8dTHMd7fgw4bnFd7jXTLZrSU/CQrKnL3m+AxCzDz40=

     

       10
       6
        
       github.com/charmbracelet/colorprofile v0.3.1/go.mod h1:/GkGusxNs8VB/RSOh3fu0TJmQ4ICMMPApIIVn0KszZ0=

     

       11
       7
        
       github.com/charmbracelet/fang v0.2.0 h1:F2sK2Zjy9kRYz/xUSF1o89DNj2BHKpxVKT7TA21KZi0=

     
···

       20
       16
        
       github.com/charmbracelet/x/cellbuf v0.0.13/go.mod h1:xe0nKWGd3eJgtqZRaN9RjMtK7xUYchjzPr7q6kcvCCs=

     

       21
       17
        
       github.com/charmbracelet/x/exp/charmtone v0.0.0-20250623112707-45752038d08d h1:Y34SmGfNOuc7NxbbSXJDvIDv3BFNhj4LGWPxqk+YoNo=

     

       22
       18
        
       github.com/charmbracelet/x/exp/charmtone v0.0.0-20250623112707-45752038d08d/go.mod h1:T9jr8CzFpjhFVHjNjKwbAD7KwBNyFnj2pntAO7F2zw0=

     

       23
       23
       -
       github.com/charmbracelet/x/exp/golden v0.0.0-20240806155701-69247e0abc2a h1:G99klV19u0QnhiizODirwVksQB91TJKV/UaTnACcG30=

     

       24
       24
       -
       github.com/charmbracelet/x/exp/golden v0.0.0-20240806155701-69247e0abc2a/go.mod h1:wDlXFlCrmJ8J+swcL/MnGUuYnqgQdW9rhSD61oNMb6U=

     

       25
       19
        
       github.com/charmbracelet/x/exp/golden v0.0.0-20241011142426-46044092ad91 h1:payRxjMjKgx2PaCWLZ4p3ro9y97+TVLZNaRZgJwSVDQ=

     

       20
       20
       +
       github.com/charmbracelet/x/exp/golden v0.0.0-20241011142426-46044092ad91/go.mod h1:wDlXFlCrmJ8J+swcL/MnGUuYnqgQdW9rhSD61oNMb6U=

     

       26
       21
        
       github.com/charmbracelet/x/term v0.2.1 h1:AQeHeLZ1OqSXhrAWpYUtZyX1T3zVxfpZuEQMIQaGIAQ=

     

       27
       22
        
       github.com/charmbracelet/x/term v0.2.1/go.mod h1:oQ4enTYFV7QN4m0i9mzHrViD7TQKvNEEkHUMCmsxdUg=

     

       28
       23
        
       github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=

     

       29
       24
        
       github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=

     

       30
       25
        
       github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

     

       31
       31
       -
       github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4=

     

       32
       32
       -
       github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f/go.mod h1:vw97MGsxSvLiUE2X8qFplwetxpGLQrlU1Q9AUEIzCaM=

     

       33
       26
        
       github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=

     

       34
       27
        
       github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=

     

       35
       28
        
       github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=

     

       36
       29
        
       github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=

     

       37
       30
        
       github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=

     

       38
       31
        
       github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=

     

       39
       39
       -
       github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4=

     

       40
       40
       -
       github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88=

     

       41
       32
        
       github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=

     

       42
       33
        
       github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=

     

       43
       43
       -
       github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D264iyp3TiX5OmNcI5cIARiQI=

     

       44
       44
       -
       github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo=

     

       45
       34
        
       github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA=

     

       46
       35
        
       github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo=

     

       47
       36
        
       github.com/muesli/mango v0.2.0 h1:iNNc0c5VLQ6fsMgAqGQofByNUBH2Q2nEbD6TaI+5yyQ=

     
···

       72
       61
        
       github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=

     

       73
       62
        
       golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=

     

       74
       63
        
       golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=

     

       75
       75
       -
       golang.org/x/sync v0.15.0 h1:KWH3jNZsfyT6xfAfKiz6MRNmd46ByHDYaZ7KSkCtdW8=

     

       76
       76
       -
       golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=

     

       77
       77
       -
       golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

     

       78
       64
        
       golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

     

       79
       65
        
       golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=

     

       80
       66
        
       golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=

+11 -4

main.go

···

       8
       8
        
       	"github.com/charmbracelet/fang"

     

       9
       9
        
       	"github.com/spf13/cobra"

     

       10
       10
        
       	"github.com/taciturnaxolotl/ctfd-alerts/clients"

     

       11
       11
       -
       	"github.com/taciturnaxolotl/ctfd-alerts/cmd/server"

     

       11
       11
       +
       	"github.com/taciturnaxolotl/ctfd-alerts/cmd/serve"

     

       12
       12
        
       	"github.com/taciturnaxolotl/ctfd-alerts/cmd/status"

     

       13
       13
        
       )

     

       14
       14
        
       

     
···

       20
       20
        
       var cmd = &cobra.Command{

     

       21
       21
        
       	Use:   "ctfd-alerts",

     

       22
       22
        
       	Short: "A tool for monitoring CTFd competitions",

     

       23
       23
       -
       	Long: `ctfd-alerts is a command-line tool that helps you monitor CTFd-based

     

       24
       24
       -
       competitions by providing real-time updates, notifications, and status information.`,

     

       23
       23
       +
       	Long: `      _    __     _             _           _

     

       24
       24
       +
         ___| |_ / _| __| |       __ _| | ___ _ __| |_ ___

     

       25
       25
       +
        / __| __| |_ / _, |_____ / _  | |/ _ \ '__| __/ __|

     

       26
       26
       +
       | (__| |_|  _| (_| |_____| (_| | |  __/ |  | |_\__ \

     

       27
       27
       +
        \___|\__|_|  \__,_|      \__,_|_|\___|_|   \__|___/

     

       28
       28
       +
       

     

       29
       29
       +
       ctfd-alerts is a command-line tool that helps you monitor CTFd-based

     

       30
       30
       +
       competitions by sending you ntfy notifications when someone bypasses

     

       31
       31
       +
       you or a new challenge is announced. You can also use the fancy status command :)`,

     

       25
       32
        
       	PersistentPreRun: func(cmd *cobra.Command, args []string) {

     

       26
       33
        
       		configFile, _ := cmd.Flags().GetString("config")

     

       27
       34
        
       		var err error

     
···

       46
       53
        
       

     

       47
       54
        
       	// Add commands

     

       48
       55
        
       	cmd.AddCommand(status.StatusCmd)

     

       49
       49
       -
       	cmd.AddCommand(server.ServerCmd)

     

       56
       56
       +
       	cmd.AddCommand(serve.ServeCmd)

     

       50
       57
        
       }

     

       51
       58
        
       

     

       52
       59
        
       func main() {

Compare changes