mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-15 12:27:59 +00:00
5823fdbef9
* project quota added
* project quota removed
* add periods table
* make log record generic
* accumulate usage
* query usage
* count action run seconds
* fix filter in ReportQuotaUsage
* fix existing tests
* fix logstore tests
* fix typo
* fix: add quota unit tests command side
* fix: add quota unit tests command side
* fix: add quota unit tests command side
* move notifications into debouncer and improve limit querying
* cleanup
* comment
* fix: add quota unit tests command side
* fix remaining quota usage query
* implement InmemLogStorage
* cleanup and linting
* improve test
* fix: add quota unit tests command side
* fix: add quota unit tests command side
* fix: add quota unit tests command side
* fix: add quota unit tests command side
* action notifications and fixes for notifications query
* revert console prefix
* fix: add quota unit tests command side
* fix: add quota integration tests
* improve accountable requests
* improve accountable requests
* fix: add quota integration tests
* fix: add quota integration tests
* fix: add quota integration tests
* comment
* remove ability to store logs in db and other changes requested from review
* changes requested from review
* changes requested from review
* Update internal/api/http/middleware/access_interceptor.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* tests: fix quotas integration tests
* improve incrementUsageStatement
* linting
* fix: delete e2e tests as intergation tests cover functionality
* Update internal/api/http/middleware/access_interceptor.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* backup
* fix conflict
* create rc
* create prerelease
* remove issue release labeling
* fix tracing
---------
Co-authored-by: Livio Spring <livio.a@gmail.com>
Co-authored-by: Stefan Benz <stefan@caos.ch>
Co-authored-by: adlerhurst <silvan.reusser@gmail.com>
(cherry picked from commit 1a49b7d298
)
122 lines
3.6 KiB
Go
122 lines
3.6 KiB
Go
package saml
|
|
|
|
import (
|
|
"fmt"
|
|
"net/http"
|
|
|
|
"github.com/zitadel/saml/pkg/provider"
|
|
|
|
http_utils "github.com/zitadel/zitadel/internal/api/http"
|
|
"github.com/zitadel/zitadel/internal/api/http/middleware"
|
|
"github.com/zitadel/zitadel/internal/api/ui/login"
|
|
"github.com/zitadel/zitadel/internal/auth/repository"
|
|
"github.com/zitadel/zitadel/internal/command"
|
|
"github.com/zitadel/zitadel/internal/crypto"
|
|
"github.com/zitadel/zitadel/internal/database"
|
|
"github.com/zitadel/zitadel/internal/eventstore"
|
|
"github.com/zitadel/zitadel/internal/eventstore/handler/crdb"
|
|
"github.com/zitadel/zitadel/internal/query"
|
|
"github.com/zitadel/zitadel/internal/telemetry/metrics"
|
|
)
|
|
|
|
const (
|
|
HandlerPrefix = "/saml/v2"
|
|
)
|
|
|
|
type Config struct {
|
|
ProviderConfig *provider.Config
|
|
}
|
|
|
|
func NewProvider(
|
|
conf Config,
|
|
externalSecure bool,
|
|
command *command.Commands,
|
|
query *query.Queries,
|
|
repo repository.Repository,
|
|
encAlg crypto.EncryptionAlgorithm,
|
|
certEncAlg crypto.EncryptionAlgorithm,
|
|
es *eventstore.Eventstore,
|
|
projections *database.DB,
|
|
instanceHandler,
|
|
userAgentCookie func(http.Handler) http.Handler,
|
|
accessHandler *middleware.AccessInterceptor,
|
|
) (*provider.Provider, error) {
|
|
metricTypes := []metrics.MetricType{metrics.MetricTypeRequestCount, metrics.MetricTypeStatusCode, metrics.MetricTypeTotalCount}
|
|
|
|
provStorage, err := newStorage(
|
|
command,
|
|
query,
|
|
repo,
|
|
encAlg,
|
|
certEncAlg,
|
|
es,
|
|
projections,
|
|
)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
options := []provider.Option{
|
|
provider.WithHttpInterceptors(
|
|
middleware.MetricsHandler(metricTypes),
|
|
middleware.TelemetryHandler(),
|
|
middleware.NoCacheInterceptor().Handler,
|
|
instanceHandler,
|
|
userAgentCookie,
|
|
accessHandler.HandleIgnorePathPrefixes(ignoredQuotaLimitEndpoint(conf.ProviderConfig)),
|
|
http_utils.CopyHeadersToContext,
|
|
),
|
|
provider.WithCustomTimeFormat("2006-01-02T15:04:05.999Z"),
|
|
}
|
|
if !externalSecure {
|
|
options = append(options, provider.WithAllowInsecure())
|
|
}
|
|
|
|
return provider.NewProvider(
|
|
provStorage,
|
|
HandlerPrefix,
|
|
conf.ProviderConfig,
|
|
options...,
|
|
)
|
|
}
|
|
|
|
func newStorage(
|
|
command *command.Commands,
|
|
query *query.Queries,
|
|
repo repository.Repository,
|
|
encAlg crypto.EncryptionAlgorithm,
|
|
certEncAlg crypto.EncryptionAlgorithm,
|
|
es *eventstore.Eventstore,
|
|
db *database.DB,
|
|
) (*Storage, error) {
|
|
return &Storage{
|
|
encAlg: encAlg,
|
|
certEncAlg: certEncAlg,
|
|
locker: crdb.NewLocker(db.DB, locksTable, signingKey),
|
|
eventstore: es,
|
|
repo: repo,
|
|
command: command,
|
|
query: query,
|
|
defaultLoginURL: fmt.Sprintf("%s%s?%s=", login.HandlerPrefix, login.EndpointLogin, login.QueryAuthRequestID),
|
|
}, nil
|
|
}
|
|
|
|
func ignoredQuotaLimitEndpoint(config *provider.Config) []string {
|
|
metadataEndpoint := HandlerPrefix + provider.DefaultMetadataEndpoint
|
|
certificateEndpoint := HandlerPrefix + provider.DefaultCertificateEndpoint
|
|
ssoEndpoint := HandlerPrefix + provider.DefaultSingleSignOnEndpoint
|
|
if config.MetadataConfig != nil && config.MetadataConfig.Path != "" {
|
|
metadataEndpoint = HandlerPrefix + config.MetadataConfig.Path
|
|
}
|
|
if config.IDPConfig == nil || config.IDPConfig.Endpoints == nil {
|
|
return []string{metadataEndpoint, certificateEndpoint, ssoEndpoint}
|
|
}
|
|
if config.IDPConfig.Endpoints.Certificate != nil && config.IDPConfig.Endpoints.Certificate.Relative() != "" {
|
|
certificateEndpoint = HandlerPrefix + config.IDPConfig.Endpoints.Certificate.Relative()
|
|
}
|
|
if config.IDPConfig.Endpoints.SingleSignOn != nil && config.IDPConfig.Endpoints.SingleSignOn.Relative() != "" {
|
|
ssoEndpoint = HandlerPrefix + config.IDPConfig.Endpoints.SingleSignOn.Relative()
|
|
}
|
|
return []string{metadataEndpoint, certificateEndpoint, ssoEndpoint}
|
|
}
|