Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dev-server:
# run air to detect any go file changes to re-build and re-run the server.

@go run github.com/air-verse/air@v1.52.3 \
--build.cmd "templ generate && go build -ldflags \"-X main.Version=$(VERSION)\" --tags dev -o tmp/bin/main ./server/" --build.bin "tmp/bin/main" --build.delay "100" \
--build.cmd "templ generate && go build -ldflags \"-X main.Version=$(VERSION)\" --tags dev -o tmp/bin/main ./cmd/soarca-gui/" --build.bin "tmp/bin/main" --build.delay "100" \
--build.exclude_dir "node_modules" \
--build.exclude_regex ".*_templ.go" \
--build.include_ext "go,templ" \
Expand Down Expand Up @@ -65,7 +65,7 @@ build: build-templ build-tailwind build-server

build-server:
echo "Compiling for every OS and Platform"
CGO_ENABLED=0 go build -o build/${BINARY_NAME} $(GOFLAGS) ./server/main.go
CGO_ENABLED=0 go build -o build/${BINARY_NAME} $(GOFLAGS) ./cmd/soarca-gui/main.go



Expand All @@ -76,7 +76,7 @@ build-templ:
@templ generate

build-tailwind:
@npx tailwindcss -m -i ./views/assets/app.css -o ./public/public/styles.css $(ARGS)
@npx tailwindcss -m -i ./pkg/views/assets/app.css -o ./pkg/public/public/styles.css $(ARGS)

lint: build-templ
GOFLAGS=-buildvcs=false golangci-lint run --timeout 5m0s -v
Expand All @@ -98,11 +98,11 @@ test: build-templ
# release

compile: build-templ build-tailwind
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o bin/${BINARY_NAME}-${VERSION}-linux-amd64 $(GOFLAGS) server/main.go
CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -o bin/${BINARY_NAME}-${VERSION}-darwin-arm64 $(GOFLAGS) server/main.go
CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -o bin/${BINARY_NAME}-${VERSION}-windows-amd64 $(GOFLAGS) server/main.go
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o bin/${BINARY_NAME}-${VERSION}-linux-amd64 $(GOFLAGS) cmd/soarca-gui/main.go
CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -o bin/${BINARY_NAME}-${VERSION}-darwin-arm64 $(GOFLAGS) cmd/soarca-gui/main.go
CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -o bin/${BINARY_NAME}-${VERSION}-windows-amd64 $(GOFLAGS) cmd/soarca-gui/main.go

sbom: build-templ compile
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 cyclonedx-gomod app -main server -json -licenses -output bin/${BINARY_NAME}-${VERSION}-linux-amd64.bom.json
CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 cyclonedx-gomod app -main server -json -licenses -output bin/${BINARY_NAME}-${VERSION}-darwin-amd64.bom.json
CGO_ENABLED=0 GOOS=windows GOARCH=amd64 cyclonedx-gomod app -main server -json -licenses -output bin/${BINARY_NAME}-${VERSION}-windows-amd64.bom.json
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 cyclonedx-gomod app -main cmd/soarca-gui -json -licenses -output bin/${BINARY_NAME}-${VERSION}-linux-amd64.bom.json
CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 cyclonedx-gomod app -main cmd/soarca-gui -json -licenses -output bin/${BINARY_NAME}-${VERSION}-darwin-amd64.bom.json
CGO_ENABLED=0 GOOS=windows GOARCH=amd64 cyclonedx-gomod app -main cmd/soarca-gui -json -licenses -output bin/${BINARY_NAME}-${VERSION}-windows-amd64.bom.json
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div align="center">
<a href="https://cossas-project.org/cossas-software/soarca"><img src="img/soarca-logo.svg"/>
<a href="https://cossas-project.org/cossas-software/soarca"><img src="assets/soarca-logo.svg"/>
</div>


Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
4 changes: 2 additions & 2 deletions server/main.go → cmd/soarca-gui/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package main
import (
"fmt"
"soarca-gui/internal/status"
"soarca-gui/routes"
"soarca-gui/utils"
"soarca-gui/pkg/routes"
"soarca-gui/pkg/utils"

"github.com/gin-gonic/gin"
"github.com/joho/godotenv"
Expand Down
4 changes: 2 additions & 2 deletions internal/status/status.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package status

import (
"runtime"
"soarca-gui/models/status"
"soarca-gui/utils"
"soarca-gui/pkg/models/status"
"soarca-gui/pkg/utils"
"time"
)

Expand Down
2 changes: 1 addition & 1 deletion backend/backend.go → pkg/backend/backend.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package backend

import "soarca-gui/models/reporter"
import "soarca-gui/pkg/models/reporter"

type Report interface {
GetReports(bearerToken string) ([]reporter.PlaybookExecutionReport, error)
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion backend/soarca/report.go → pkg/backend/soarca/report.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package soarca
import (
"fmt"
"net/http"
"soarca-gui/models/reporter"
"soarca-gui/pkg/models/reporter"
)

const (
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions handlers/auth.go → pkg/handlers/auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package handlers
import (
"errors"
"net/http"
"soarca-gui/utils"
"soarca-gui/pkg/utils"
"strings"

authviews "soarca-gui/views/auth"
authviews "soarca-gui/pkg/views/auth"

"github.com/gin-gonic/gin"
)
Expand Down
6 changes: 3 additions & 3 deletions handlers/dashboard.go → pkg/handlers/dashboard.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package handlers

import (
"net/http"
"soarca-gui/utils"
"soarca-gui/views/dashboards/home"
"soarca-gui/views/layouts"
"soarca-gui/pkg/utils"
"soarca-gui/pkg/views/dashboards/home"
"soarca-gui/pkg/views/layouts"

auth_context "github.com/COSSAS/gauth/context"
"github.com/gin-gonic/gin"
Expand Down
4 changes: 2 additions & 2 deletions handlers/oidc_handler.go → pkg/handlers/oidc_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package handlers

import (
"net/http"
"soarca-gui/utils"
"soarca-gui/pkg/utils"

authviews "soarca-gui/views/auth"
authviews "soarca-gui/pkg/views/auth"

"github.com/COSSAS/gauth"
"github.com/gin-gonic/gin"
Expand Down
12 changes: 6 additions & 6 deletions handlers/reporting.go → pkg/handlers/reporting.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ package handlers
import (
"errors"
"net/http"
"soarca-gui/backend"
"soarca-gui/models/reporter"
"soarca-gui/utils"
"soarca-gui/views/components/cards"
"soarca-gui/views/components/table"
reporting_dashboard "soarca-gui/views/dashboards/reporting"
"soarca-gui/pkg/backend"
"soarca-gui/pkg/models/reporter"
"soarca-gui/pkg/utils"
"soarca-gui/pkg/views/components/cards"
"soarca-gui/pkg/views/components/table"
reporting_dashboard "soarca-gui/pkg/views/dashboards/reporting"

gauth_context "github.com/COSSAS/gauth/context"
"github.com/gin-gonic/gin"
Expand Down
4 changes: 2 additions & 2 deletions handlers/settings.go → pkg/handlers/settings.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package handlers
import (
"net/http"

"soarca-gui/utils"
"soarca-gui/views/dashboards/settings"
"soarca-gui/pkg/utils"
"soarca-gui/pkg/views/dashboards/settings"

"github.com/gin-gonic/gin"
)
Expand Down
6 changes: 3 additions & 3 deletions handlers/status.go → pkg/handlers/status.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package handlers

import (
"net/http"
"soarca-gui/backend"
"soarca-gui/utils"
"soarca-gui/views/components/indicators"
"soarca-gui/pkg/backend"
"soarca-gui/pkg/utils"
"soarca-gui/pkg/views/components/indicators"

gauth_context "github.com/COSSAS/gauth/context"
"github.com/gin-gonic/gin"
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package reporter
import (
"time"

"soarca-gui/models/cacao"
"soarca-gui/pkg/models/cacao"
)

type PlaybookExecutionReport struct {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
10 changes: 5 additions & 5 deletions routes/routes.go → pkg/routes/routes.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ package routes
import (
"log"
"net/http"
"soarca-gui/backend"
"soarca-gui/backend/soarca"
"soarca-gui/handlers"
"soarca-gui/public"
"soarca-gui/utils"
"soarca-gui/pkg/backend"
"soarca-gui/pkg/backend/soarca"
"soarca-gui/pkg/handlers"
"soarca-gui/pkg/public"
"soarca-gui/pkg/utils"
"strconv"

"github.com/COSSAS/gauth"
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion utils/http_test.go → pkg/utils/http_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"net/http/httptest"
"testing"

"soarca-gui/utils"
"soarca-gui/pkg/utils"
)

type RequestBody struct {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions views/auth/login.templ → pkg/views/auth/login.templ
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package authviews

import (
"soarca-gui/views/components/notifications"
"soarca-gui/views/layouts"
"soarca-gui/pkg/views/components/notifications"
"soarca-gui/pkg/views/layouts"
)

const (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package authviews

import (
"soarca-gui/views/layouts"
"soarca-gui/pkg/views/layouts"
)


Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package alerts

import "soarca-gui/utils"
import "soarca-gui/pkg/utils"

const (
baseClassWarning = "flex w-full max-w-sm overflow-hidden bg-white rounded-lg shadow-md dark:bg-gray-800"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package cards

import "soarca-gui/utils"
import "soarca-gui/pkg/utils"

const cardBaseCSS = "p-2 m-2 rounded-lg bg-white border-gray-100 shadow-md dark:bg-c-dark-slate-navbar-background dark:border-2 dark:border-c-dark-slate-border"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package cards

import (
"fmt"
"soarca-gui/views/components/icons"
"soarca-gui/pkg/views/components/icons"
)

const (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package headbar

import (
"soarca-gui/utils"
"soarca-gui/views/components/icons"
"soarca-gui/views/components/indicators"
"soarca-gui/pkg/utils"
"soarca-gui/pkg/views/components/icons"
"soarca-gui/pkg/views/components/indicators"
)

templ themeButton() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package icons

import "soarca-gui/utils"
import "soarca-gui/pkg/utils"

type Icon struct {
iconName string
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package indicators

import (
"soarca-gui/utils"
"soarca-gui/views/components/icons"
"soarca-gui/pkg/utils"
"soarca-gui/pkg/views/components/icons"
)

const baseClassTag = "inline-flex items-center px-3 py-1 rounded-full gap-x-2"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package navbar

import (
"soarca-gui/internal/status"
"soarca-gui/views/components/icons"
"soarca-gui/pkg/views/components/icons"
)

const (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ package table

import (
"fmt"
"soarca-gui/utils"
"soarca-gui/pkg/utils"
"time"

"soarca-gui/views/components/cards"
"soarca-gui/views/components/indicators"
"soarca-gui/pkg/views/components/cards"
"soarca-gui/pkg/views/components/indicators"
)

const (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package table

import "soarca-gui/utils"
import "soarca-gui/pkg/utils"

const (
tMainClass = "w-full text-left text-sm text-slate-700 dark:text-slate-300"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package home

import (
"soarca-gui/utils"
"soarca-gui/views/components/cards"
card "soarca-gui/views/components/cards"
"soarca-gui/views/components/icons"
"soarca-gui/views/layouts"
"soarca-gui/pkg/utils"
"soarca-gui/pkg/views/components/cards"
card "soarca-gui/pkg/views/components/cards"
"soarca-gui/pkg/views/components/icons"
"soarca-gui/pkg/views/layouts"
)

const (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package reporting

import (
"soarca-gui/utils"
"soarca-gui/views/components/cards"
"soarca-gui/views/components/table"
"soarca-gui/views/layouts"
"soarca-gui/pkg/utils"
"soarca-gui/pkg/views/components/cards"
"soarca-gui/pkg/views/components/table"
"soarca-gui/pkg/views/layouts"
)

templ ReportingIndex() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ package reporting
import (
"encoding/json"
"fmt"
"soarca-gui/models/cacao"
"soarca-gui/models/reporter"
"soarca-gui/utils"
"soarca-gui/views/components/alerts"
"soarca-gui/views/components/cards"
"soarca-gui/views/components/icons"
"soarca-gui/views/components/indicators"
"soarca-gui/views/layouts"
"soarca-gui/pkg/models/cacao"
"soarca-gui/pkg/models/reporter"
"soarca-gui/pkg/utils"
"soarca-gui/pkg/views/components/alerts"
"soarca-gui/pkg/views/components/cards"
"soarca-gui/pkg/views/components/icons"
"soarca-gui/pkg/views/components/indicators"
"soarca-gui/pkg/views/layouts"
"time"
)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package settings

import (
"soarca-gui/views/components/cards"
"soarca-gui/views/layouts"
"soarca-gui/pkg/views/components/cards"
"soarca-gui/pkg/views/layouts"
)

const (
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package layouts

import (
"soarca-gui/utils"
"soarca-gui/views/components/headbar"
"soarca-gui/views/components/icons"
"soarca-gui/views/components/navbar"
"soarca-gui/pkg/utils"
"soarca-gui/pkg/views/components/headbar"
"soarca-gui/pkg/views/components/icons"
"soarca-gui/pkg/views/components/navbar"
)

const (
Expand Down
Loading