Skip to content
Open
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ coverage.out.tmp
/.idea
go.work
go.work.sum
.worktrees/
19 changes: 15 additions & 4 deletions broker/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ SQL_GEN_OUT_EVENT = events/event_db_gen.go events/event_models_gen.go events/eve
SQL_GEN_OUT_PR = patron_request/db/pr_db_gen.go patron_request/db/pr_models_gen.go patron_request/db/pr_query.sql_gen.go
SQL_GEN_OUT_PS = pullslip/db/ps_db_gen.go pullslip/db/ps_models_gen.go pullslip/db/ps_query.sql_gen.go
SQL_GEN_OUT_SCHED = scheduler/db/sched_db_gen.go scheduler/db/sched_models_gen.go scheduler/db/sched_query.sql_gen.go
SQL_GEN_OUT = $(SQL_GEN_OUT_ILL_DB) $(SQL_GEN_OUT_EVENT) $(SQL_GEN_OUT_PR) $(SQL_GEN_OUT_PS) $(SQL_GEN_OUT_SCHED)
SQL_GEN_OUT_IMPORT = import/db/import_db_gen.go import/db/import_models_gen.go import/db/import_query.sql_gen.go
SQL_GEN_OUT = $(SQL_GEN_OUT_ILL_DB) $(SQL_GEN_OUT_EVENT) $(SQL_GEN_OUT_PR) $(SQL_GEN_OUT_PS) $(SQL_GEN_OUT_SCHED) $(SQL_GEN_OUT_IMPORT)
SQL_GEN_IN = sqlc/*.sql

# OpenAPI
Expand Down Expand Up @@ -61,6 +62,12 @@ SCHED_OAPI_CFG = $(SCHED_OAPI_DIR)/sched-cfg.yaml
SCHED_OAPI_SPEC = $(SCHED_OAPI_DIR)/open-api.yaml
SCHED_OAPI_GEN = scheduler/oapi/sched_openapi_gen.go

# Import OpenAPI
IMPORT_OAPI_DIR=oapi
IMPORT_OAPI_CFG = $(IMPORT_OAPI_DIR)/import-cfg.yaml
IMPORT_OAPI_SPEC = $(IMPORT_OAPI_DIR)/open-api.yaml
IMPORT_OAPI_GEN = import/oapi/import_openapi_gen.go

.PHONY: all docker generate generate-sqlc generate-api generate-commit-id check run fmt fmt-check clean clean-build-caches view-coverage deps-update tools-update lint vulncheck check-coverage

all: $(BINARY) archive
Expand All @@ -74,7 +81,7 @@ generate-commit-id: $(COMMIT_ID)

generate-sqlc: $(SQL_GEN_OUT)

generate-api: $(OAPI_GEN) $(PR_OAPI_GEN) $(PS_OAPI_GEN) $(SCHED_OAPI_GEN)
generate-api: $(OAPI_GEN) $(PR_OAPI_GEN) $(PS_OAPI_GEN) $(SCHED_OAPI_GEN) $(IMPORT_OAPI_GEN)

$(STATE_MODELS_JSON): $(STATE_MODELS_YAML)
mkdir -p $(@D)
Expand All @@ -93,16 +100,19 @@ $(PS_OAPI_GEN): $(PS_OAPI_CFG) $(PS_OAPI_SPEC)
$(SCHED_OAPI_GEN): $(SCHED_OAPI_CFG) $(SCHED_OAPI_SPEC)
$(OAPI_CODEGEN) -config ./$(SCHED_OAPI_CFG) ./$(SCHED_OAPI_SPEC)

$(IMPORT_OAPI_GEN): $(IMPORT_OAPI_CFG) $(IMPORT_OAPI_SPEC) $(OAPI_OVERLAY)
$(OAPI_CODEGEN) -config ./$(IMPORT_OAPI_CFG) ./$(IMPORT_OAPI_SPEC)

$(SQL_GEN_OUT): $(SQL_GEN_IN) $(SQLC_CONFIG)
$(SQLC) generate -f $(SQLC_CONFIG)

$(COMMIT_ID): $(GIT_COMMIT_DEPS)
commit_id="$$( $(GIT) rev-parse --short HEAD )" && printf '%s' "$$commit_id" > $(COMMIT_ID)

$(BINARY): $(COMMIT_ID) $(SQL_GEN_OUT) $(OAPI_GEN) $(PR_OAPI_GEN) $(PS_OAPI_GEN) $(SCHED_OAPI_GEN) $(BUILD_GOFILES) $(STATE_MODELS_JSON)
$(BINARY): $(COMMIT_ID) $(SQL_GEN_OUT) $(OAPI_GEN) $(PR_OAPI_GEN) $(PS_OAPI_GEN) $(SCHED_OAPI_GEN) $(IMPORT_OAPI_GEN) $(BUILD_GOFILES) $(STATE_MODELS_JSON)
$(GO) build -v -o $(BINARY) ./$(MAIN_PACKAGE)

archive: $(COMMIT_ID) $(SQL_GEN_OUT) $(OAPI_GEN) $(PR_OAPI_GEN) $(PS_OAPI_GEN) $(SCHED_OAPI_GEN) $(BUILD_GOFILES) $(STATE_MODELS_JSON)
archive: $(COMMIT_ID) $(SQL_GEN_OUT) $(OAPI_GEN) $(PR_OAPI_GEN) $(PS_OAPI_GEN) $(SCHED_OAPI_GEN) $(IMPORT_OAPI_GEN) $(BUILD_GOFILES) $(STATE_MODELS_JSON)
$(GO) build -v -o archive ./cmd/archive

check: generate
Expand Down Expand Up @@ -149,6 +159,7 @@ clean:
rm -f $(PR_OAPI_GEN)
rm -f $(PS_OAPI_GEN)
rm -f $(SCHED_OAPI_GEN)
rm -f $(IMPORT_OAPI_GEN)

clean-build-caches:
$(GO) clean -cache
Expand Down
52 changes: 30 additions & 22 deletions broker/app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ import (
"github.com/getkin/kin-openapi/openapi3"
"github.com/indexdata/crosslink/broker/catalog"
"github.com/indexdata/crosslink/broker/email"
importapi "github.com/indexdata/crosslink/broker/import/api"
importdb "github.com/indexdata/crosslink/broker/import/db"
importoapi "github.com/indexdata/crosslink/broker/import/oapi"
prapi "github.com/indexdata/crosslink/broker/patron_request/api"
pr_db "github.com/indexdata/crosslink/broker/patron_request/db"
"github.com/indexdata/crosslink/broker/patron_request/proapi"
Expand Down Expand Up @@ -99,17 +102,18 @@ var ServeMux *http.ServeMux
var appCtx = common.CreateExtCtxWithLogArgsAndHandler(context.Background(), nil, configLog())

type Context struct {
EventBus events.EventBus
IllRepo ill_db.IllRepo
EventRepo events.EventRepo
DirAdapter adapter.DirectoryLookupAdapter
PrRepo pr_db.PrRepo
TenantResolver *tenant.TenantResolver
ApiHandler api.ApiHandler
PrApiHandler prapi.PatronRequestApiHandler
SseBroker *api.SseBroker
PsApiHandler psapi.PullSlipApiHandler
SchedApiHandler schedapi.SchedulerApiHandler
EventBus events.EventBus
IllRepo ill_db.IllRepo
EventRepo events.EventRepo
DirAdapter adapter.DirectoryLookupAdapter
PrRepo pr_db.PrRepo
TenantResolver *tenant.TenantResolver
ApiHandler api.ApiHandler
PrApiHandler prapi.PatronRequestApiHandler
SseBroker *api.SseBroker
PsApiHandler psapi.PullSlipApiHandler
SchedApiHandler schedapi.SchedulerApiHandler
ImportApiHandler importapi.ApiHandler
}

func configLog() slog.Handler {
Expand Down Expand Up @@ -221,18 +225,21 @@ func Init(ctx context.Context) (Context, error) {
return Context{}, err
}

importRepo := importdb.CreateImportRepo(pool)
importApiHandler := importapi.NewApiHandler(importRepo, illRepo, dirAdapter, &prservice.StateModelService{})
return Context{
EventBus: eventBus,
IllRepo: illRepo,
EventRepo: eventRepo,
DirAdapter: dirAdapter,
PrRepo: prRepo,
TenantResolver: tenantResolver,
ApiHandler: apiHandler,
PrApiHandler: prApiHandler,
SseBroker: sseBroker,
PsApiHandler: psApiHandler,
SchedApiHandler: schedApiHandler,
EventBus: eventBus,
IllRepo: illRepo,
EventRepo: eventRepo,
DirAdapter: dirAdapter,
PrRepo: prRepo,
TenantResolver: tenantResolver,
ApiHandler: apiHandler,
PrApiHandler: prApiHandler,
SseBroker: sseBroker,
PsApiHandler: psApiHandler,
SchedApiHandler: schedApiHandler,
ImportApiHandler: importApiHandler,
}, nil
}

Expand Down Expand Up @@ -267,6 +274,7 @@ func StartServer(ctx Context) error {
})
psoapi.HandlerFromMux(&ctx.PsApiHandler, ServeMux)
schedoapi.HandlerFromMux(&ctx.SchedApiHandler, ServeMux)
importoapi.HandlerFromMux(&ctx.ImportApiHandler, ServeMux)

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need it?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if you do mount it, it must enforce the tenant

ServeMux.HandleFunc("GET /sse/events", ctx.SseBroker.ServeHTTP)
if ctx.TenantResolver.HasTenantMapping() {
basePath := tenant.OKAPI_PATH_PREFIX
Expand Down
81 changes: 81 additions & 0 deletions broker/import/api/api_handler.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
package importapi

import (
"errors"
"mime"
"net/http"

"github.com/indexdata/crosslink/broker/adapter"
brokerapi "github.com/indexdata/crosslink/broker/api"
"github.com/indexdata/crosslink/broker/common"
"github.com/indexdata/crosslink/broker/ill_db"
importdb "github.com/indexdata/crosslink/broker/import/db"
importoapi "github.com/indexdata/crosslink/broker/import/oapi"
"github.com/indexdata/crosslink/broker/import/service"
prservice "github.com/indexdata/crosslink/broker/patron_request/service"
)

type ApiHandler struct {
importer service.Importer
maxImportBodyBytes int64
}

const maxImportBodyBytes int64 = 2 << 30 // 2 GB

var _ importoapi.ServerInterface = (*ApiHandler)(nil)

func NewApiHandler(repo importdb.ImportRepo, illRepo ill_db.IllRepo, directoryAdapter adapter.DirectoryLookupAdapter, stateModels *prservice.StateModelService) ApiHandler {
return ApiHandler{
importer: service.NewImporter(repo, illRepo, directoryAdapter, stateModels, nil),
}
}

func (a *ApiHandler) PostImport(w http.ResponseWriter, r *http.Request, params importoapi.PostImportParams) {
ctx := common.CreateExtCtxWithArgs(r.Context(), &common.LoggerArgs{
Other: map[string]string{"method": "PostImport"},
})
policyValue := ""
if params.ConflictPolicy != nil {
policyValue = string(*params.ConflictPolicy)
}
policy, err := importdb.ParseConflictPolicy(policyValue)
if err != nil {
brokerapi.AddBadRequestError(ctx, w, err)
return
}
if r.Body == nil || r.Body == http.NoBody {
brokerapi.AddBadRequestError(ctx, w, errors.New("body is required"))
return
}
if !isNDJSONContentType(r.Header.Get("Content-Type")) {
brokerapi.AddBadRequestError(ctx, w, errors.New("content type must be application/x-ndjson"))
return
}

bodyLimit := a.maxImportBodyBytes
if bodyLimit <= 0 {
bodyLimit = maxImportBodyBytes
}
if r.ContentLength > bodyLimit {
http.Error(w, "import request too large", http.StatusRequestEntityTooLarge)
return
}
r.Body = http.MaxBytesReader(w, r.Body, bodyLimit)
result, err := a.importer.Import(ctx, policy, r.Body)
if err != nil {
var maxBytesErr *http.MaxBytesError
if errors.As(err, &maxBytesErr) || errors.Is(err, service.ErrImportRecordTooLarge) {
http.Error(w, "import request too large", http.StatusRequestEntityTooLarge)
return
}
ctx.Logger().Error("failed to read import request", "error", err)
http.Error(w, "failed to read import request", http.StatusInternalServerError)
return
}
brokerapi.WriteJsonResponse(w, result)
}

func isNDJSONContentType(contentType string) bool {
mediaType, _, err := mime.ParseMediaType(contentType)
return err == nil && mediaType == "application/x-ndjson"
}
Loading
Loading