Compare commits
147 Commits
version/20
...
root/maint
Author | SHA1 | Date | |
---|---|---|---|
182d264029 | |||
9f1cde18b2 | |||
e7cfe5343a | |||
d4bf3b7068 | |||
14867e3fdd | |||
a681af0c6e | |||
dc9de43399 | |||
01fc5eb4ce | |||
50015c5463 | |||
83d281eae5 | |||
9e96f19cb9 | |||
3cec4d23e8 | |||
a70be016d9 | |||
c957a5016d | |||
f4d9b2e6bd | |||
0e033d1f61 | |||
c8e6e60f70 | |||
ce997f4473 | |||
be30cb4553 | |||
88b6076161 | |||
fbba672161 | |||
b4e41de8ba | |||
ac00386a29 | |||
10a473eb90 | |||
4744550a3c | |||
2b8121f765 | |||
e900df358d | |||
75df0ab154 | |||
826d2eec7a | |||
bb5e7628b9 | |||
57e9474658 | |||
89b6b7a29a | |||
4859dc7e68 | |||
550e24edde | |||
39371bb3a6 | |||
cea49c475e | |||
282946c156 | |||
9c27b81e4b | |||
0bdef2a0f4 | |||
fcbee2edaa | |||
6b4c0bcb4b | |||
1e19ba6cb0 | |||
6702f34b40 | |||
c9036f870d | |||
bcb91d2812 | |||
a2547e928d | |||
14d013645f | |||
e53479f69c | |||
dd14bfbe87 | |||
cf6c3c6d3f | |||
74171e0b5a | |||
7f9de1ab7e | |||
7358f3bc37 | |||
94400191a2 | |||
efdb1339d6 | |||
725fd899ca | |||
dffe3b563d | |||
a892d4afd8 | |||
1f6ae73e6e | |||
568d5c3446 | |||
54bbdd5ea8 | |||
eb9d8c214b | |||
0cffe0c953 | |||
6d5a61187e | |||
df4cdf1932 | |||
887fbb7e86 | |||
b2c9dff6d5 | |||
6b155621fe | |||
4f1ddc5779 | |||
10d50481c9 | |||
d1303236c6 | |||
5d231ce59b | |||
f6afdc05ff | |||
d68a8ce0b3 | |||
a14d120749 | |||
9036724b66 | |||
022b52075f | |||
cdea9a9553 | |||
2ea7196fd3 | |||
729102a5c9 | |||
22e269234d | |||
750aaf22ac | |||
556eca2665 | |||
4aeb243692 | |||
71361e5de7 | |||
f92061afd7 | |||
dbc477c7b1 | |||
dfb4f86c25 | |||
49577fe333 | |||
05b5987ccb | |||
0a862e4fff | |||
821e296c7e | |||
b44b5c1d3a | |||
4774f86d64 | |||
4b9abaefad | |||
21d3e33985 | |||
2ee47d1b4d | |||
0f8d497413 | |||
7352f37b05 | |||
f128ac026d | |||
5198174e08 | |||
92fcb42f8a | |||
1a02a9c978 | |||
96f49ed489 | |||
f4a27958b6 | |||
ee687002dd | |||
962bc54464 | |||
c79851f582 | |||
493d2843d8 | |||
d2324fd073 | |||
7d82b856ba | |||
08e60b5237 | |||
98a8dca292 | |||
2a05dc50d6 | |||
c24b619fb6 | |||
f192690f25 | |||
ecd013401c | |||
38adb41244 | |||
712e5084c1 | |||
e2f8574b6a | |||
d43940d5d6 | |||
faaba483a0 | |||
fa78c24516 | |||
8245d08ddb | |||
f452617f29 | |||
ed6d1880a0 | |||
2909a15009 | |||
8601638831 | |||
c38adcf25a | |||
ce92f77372 | |||
ceb702b19e | |||
c445fbf544 | |||
087fa4306f | |||
88b90a365c | |||
626a5397ca | |||
cace69d6f8 | |||
5d1e7a847a | |||
d27d222ab3 | |||
b16e1e7f96 | |||
c0128945e3 | |||
5447c2e78e | |||
15f173d8d4 | |||
b533f416b8 | |||
57dc595cfb | |||
88a90e241a | |||
eac3e88126 | |||
abfc907ad6 |
@ -1,5 +1,5 @@
|
|||||||
[bumpversion]
|
[bumpversion]
|
||||||
current_version = 2024.8.3
|
current_version = 2024.10.2
|
||||||
tag = True
|
tag = True
|
||||||
commit = True
|
commit = True
|
||||||
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(?:-(?P<rc_t>[a-zA-Z-]+)(?P<rc_n>[1-9]\\d*))?
|
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(?:-(?P<rc_t>[a-zA-Z-]+)(?P<rc_n>[1-9]\\d*))?
|
||||||
|
6
.github/workflows/ci-main.yml
vendored
6
.github/workflows/ci-main.yml
vendored
@ -116,7 +116,7 @@ jobs:
|
|||||||
poetry run make test
|
poetry run make test
|
||||||
poetry run coverage xml
|
poetry run coverage xml
|
||||||
- if: ${{ always() }}
|
- if: ${{ always() }}
|
||||||
uses: codecov/codecov-action@v4
|
uses: codecov/codecov-action@v5
|
||||||
with:
|
with:
|
||||||
flags: unit
|
flags: unit
|
||||||
token: ${{ secrets.CODECOV_TOKEN }}
|
token: ${{ secrets.CODECOV_TOKEN }}
|
||||||
@ -140,7 +140,7 @@ jobs:
|
|||||||
poetry run coverage run manage.py test tests/integration
|
poetry run coverage run manage.py test tests/integration
|
||||||
poetry run coverage xml
|
poetry run coverage xml
|
||||||
- if: ${{ always() }}
|
- if: ${{ always() }}
|
||||||
uses: codecov/codecov-action@v4
|
uses: codecov/codecov-action@v5
|
||||||
with:
|
with:
|
||||||
flags: integration
|
flags: integration
|
||||||
token: ${{ secrets.CODECOV_TOKEN }}
|
token: ${{ secrets.CODECOV_TOKEN }}
|
||||||
@ -198,7 +198,7 @@ jobs:
|
|||||||
poetry run coverage run manage.py test ${{ matrix.job.glob }}
|
poetry run coverage run manage.py test ${{ matrix.job.glob }}
|
||||||
poetry run coverage xml
|
poetry run coverage xml
|
||||||
- if: ${{ always() }}
|
- if: ${{ always() }}
|
||||||
uses: codecov/codecov-action@v4
|
uses: codecov/codecov-action@v5
|
||||||
with:
|
with:
|
||||||
flags: e2e
|
flags: e2e
|
||||||
token: ${{ secrets.CODECOV_TOKEN }}
|
token: ${{ secrets.CODECOV_TOKEN }}
|
||||||
|
@ -80,7 +80,7 @@ RUN --mount=type=cache,sharing=locked,target=/go/pkg/mod \
|
|||||||
go build -o /go/authentik ./cmd/server
|
go build -o /go/authentik ./cmd/server
|
||||||
|
|
||||||
# Stage 4: MaxMind GeoIP
|
# Stage 4: MaxMind GeoIP
|
||||||
FROM --platform=${BUILDPLATFORM} ghcr.io/maxmind/geoipupdate:v7.0.1 AS geoip
|
FROM --platform=${BUILDPLATFORM} ghcr.io/maxmind/geoipupdate:v7.1.0 AS geoip
|
||||||
|
|
||||||
ENV GEOIPUPDATE_EDITION_IDS="GeoLite2-City GeoLite2-ASN"
|
ENV GEOIPUPDATE_EDITION_IDS="GeoLite2-City GeoLite2-ASN"
|
||||||
ENV GEOIPUPDATE_VERBOSE="1"
|
ENV GEOIPUPDATE_VERBOSE="1"
|
||||||
|
9
Makefile
9
Makefile
@ -149,7 +149,7 @@ gen-client-ts: gen-clean-ts ## Build and install the authentik API for Typescri
|
|||||||
docker run \
|
docker run \
|
||||||
--rm -v ${PWD}:/local \
|
--rm -v ${PWD}:/local \
|
||||||
--user ${UID}:${GID} \
|
--user ${UID}:${GID} \
|
||||||
docker.io/openapitools/openapi-generator-cli:v6.5.0 generate \
|
docker.io/openapitools/openapi-generator-cli:v7.10.0 generate \
|
||||||
-i /local/schema.yml \
|
-i /local/schema.yml \
|
||||||
-g typescript-fetch \
|
-g typescript-fetch \
|
||||||
-o /local/${GEN_API_TS} \
|
-o /local/${GEN_API_TS} \
|
||||||
@ -165,7 +165,7 @@ gen-client-py: gen-clean-py ## Build and install the authentik API for Python
|
|||||||
docker run \
|
docker run \
|
||||||
--rm -v ${PWD}:/local \
|
--rm -v ${PWD}:/local \
|
||||||
--user ${UID}:${GID} \
|
--user ${UID}:${GID} \
|
||||||
docker.io/openapitools/openapi-generator-cli:v7.4.0 generate \
|
docker.io/openapitools/openapi-generator-cli:v7.10.0 generate \
|
||||||
-i /local/schema.yml \
|
-i /local/schema.yml \
|
||||||
-g python \
|
-g python \
|
||||||
-o /local/${GEN_API_PY} \
|
-o /local/${GEN_API_PY} \
|
||||||
@ -184,13 +184,14 @@ gen-client-go: gen-clean-go ## Build and install the authentik API for Golang
|
|||||||
docker run \
|
docker run \
|
||||||
--rm -v ${PWD}/${GEN_API_GO}:/local \
|
--rm -v ${PWD}/${GEN_API_GO}:/local \
|
||||||
--user ${UID}:${GID} \
|
--user ${UID}:${GID} \
|
||||||
docker.io/openapitools/openapi-generator-cli:v6.5.0 generate \
|
docker.io/openapitools/openapi-generator-cli:v7.10.0 generate \
|
||||||
-i /local/schema.yml \
|
-i /local/schema.yml \
|
||||||
-g go \
|
-g go \
|
||||||
-o /local/ \
|
-o /local/ \
|
||||||
-c /local/config.yaml
|
-c /local/config.yaml
|
||||||
go mod edit -replace goauthentik.io/api/v3=./${GEN_API_GO}
|
go mod edit -replace goauthentik.io/api/v3=./${GEN_API_GO}
|
||||||
rm -rf ./${GEN_API_GO}/config.yaml ./${GEN_API_GO}/templates/
|
rm -rf ./${GEN_API_GO}/config.yaml ./${GEN_API_GO}/templates/ ./${GEN_API_GO}/test
|
||||||
|
go run golang.org/x/tools/cmd/goimports@latest -w ./${GEN_API_GO}
|
||||||
|
|
||||||
gen-dev-config: ## Generate a local development config file
|
gen-dev-config: ## Generate a local development config file
|
||||||
python -m scripts.generate_config
|
python -m scripts.generate_config
|
||||||
|
@ -18,10 +18,10 @@ Even if the issue is not a CVE, we still greatly appreciate your help in hardeni
|
|||||||
|
|
||||||
(.x being the latest patch release for each version)
|
(.x being the latest patch release for each version)
|
||||||
|
|
||||||
| Version | Supported |
|
| Version | Supported |
|
||||||
| -------- | --------- |
|
| --------- | --------- |
|
||||||
| 2024.6.x | ✅ |
|
| 2024.8.x | ✅ |
|
||||||
| 2024.8.x | ✅ |
|
| 2024.10.x | ✅ |
|
||||||
|
|
||||||
## Reporting a Vulnerability
|
## Reporting a Vulnerability
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
from os import environ
|
from os import environ
|
||||||
|
|
||||||
__version__ = "2024.8.3"
|
__version__ = "2024.10.2"
|
||||||
ENV_GIT_HASH_KEY = "GIT_BUILD_HASH"
|
ENV_GIT_HASH_KEY = "GIT_BUILD_HASH"
|
||||||
|
|
||||||
|
|
||||||
|
@ -7,7 +7,7 @@ API Browser - {{ brand.branding_title }}
|
|||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block head %}
|
{% block head %}
|
||||||
{% versioned_script "dist/standalone/api-browser/index-%v.js" %}
|
<script src="{% versioned_script 'dist/standalone/api-browser/index-%v.js' %}" type="module"></script>
|
||||||
<meta name="theme-color" content="#151515" media="(prefers-color-scheme: light)">
|
<meta name="theme-color" content="#151515" media="(prefers-color-scheme: light)">
|
||||||
<meta name="theme-color" content="#151515" media="(prefers-color-scheme: dark)">
|
<meta name="theme-color" content="#151515" media="(prefers-color-scheme: dark)">
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
@ -27,7 +27,8 @@ def blueprint_tester(file_name: Path) -> Callable:
|
|||||||
base = Path("blueprints/")
|
base = Path("blueprints/")
|
||||||
rel_path = Path(file_name).relative_to(base)
|
rel_path = Path(file_name).relative_to(base)
|
||||||
importer = Importer.from_string(BlueprintInstance(path=str(rel_path)).retrieve())
|
importer = Importer.from_string(BlueprintInstance(path=str(rel_path)).retrieve())
|
||||||
self.assertTrue(importer.validate()[0])
|
validation, logs = importer.validate()
|
||||||
|
self.assertTrue(validation, logs)
|
||||||
self.assertTrue(importer.apply())
|
self.assertTrue(importer.apply())
|
||||||
|
|
||||||
return tester
|
return tester
|
||||||
|
@ -293,7 +293,11 @@ class Importer:
|
|||||||
|
|
||||||
serializer_kwargs = {}
|
serializer_kwargs = {}
|
||||||
model_instance = existing_models.first()
|
model_instance = existing_models.first()
|
||||||
if not isinstance(model(), BaseMetaModel) and model_instance:
|
if (
|
||||||
|
not isinstance(model(), BaseMetaModel)
|
||||||
|
and model_instance
|
||||||
|
and entry.state != BlueprintEntryDesiredState.MUST_CREATED
|
||||||
|
):
|
||||||
self.logger.debug(
|
self.logger.debug(
|
||||||
"Initialise serializer with instance",
|
"Initialise serializer with instance",
|
||||||
model=model,
|
model=model,
|
||||||
@ -303,11 +307,12 @@ class Importer:
|
|||||||
serializer_kwargs["instance"] = model_instance
|
serializer_kwargs["instance"] = model_instance
|
||||||
serializer_kwargs["partial"] = True
|
serializer_kwargs["partial"] = True
|
||||||
elif model_instance and entry.state == BlueprintEntryDesiredState.MUST_CREATED:
|
elif model_instance and entry.state == BlueprintEntryDesiredState.MUST_CREATED:
|
||||||
|
msg = (
|
||||||
|
f"State is set to {BlueprintEntryDesiredState.MUST_CREATED.value} "
|
||||||
|
"and object exists already",
|
||||||
|
)
|
||||||
raise EntryInvalidError.from_entry(
|
raise EntryInvalidError.from_entry(
|
||||||
(
|
ValidationError({k: msg for k in entry.identifiers.keys()}, "unique"),
|
||||||
f"State is set to {BlueprintEntryDesiredState.MUST_CREATED} "
|
|
||||||
"and object exists already",
|
|
||||||
),
|
|
||||||
entry,
|
entry,
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
|
@ -4,7 +4,7 @@ from collections.abc import Callable
|
|||||||
|
|
||||||
from django.http.request import HttpRequest
|
from django.http.request import HttpRequest
|
||||||
from django.http.response import HttpResponse
|
from django.http.response import HttpResponse
|
||||||
from django.utils.translation import activate
|
from django.utils.translation import override
|
||||||
|
|
||||||
from authentik.brands.utils import get_brand_for_request
|
from authentik.brands.utils import get_brand_for_request
|
||||||
|
|
||||||
@ -18,10 +18,12 @@ class BrandMiddleware:
|
|||||||
self.get_response = get_response
|
self.get_response = get_response
|
||||||
|
|
||||||
def __call__(self, request: HttpRequest) -> HttpResponse:
|
def __call__(self, request: HttpRequest) -> HttpResponse:
|
||||||
|
locale_to_set = None
|
||||||
if not hasattr(request, "brand"):
|
if not hasattr(request, "brand"):
|
||||||
brand = get_brand_for_request(request)
|
brand = get_brand_for_request(request)
|
||||||
request.brand = brand
|
request.brand = brand
|
||||||
locale = brand.default_locale
|
locale = brand.default_locale
|
||||||
if locale != "":
|
if locale != "":
|
||||||
activate(locale)
|
locale_to_set = locale
|
||||||
return self.get_response(request)
|
with override(locale_to_set):
|
||||||
|
return self.get_response(request)
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
"""Authenticator Devices API Views"""
|
"""Authenticator Devices API Views"""
|
||||||
|
|
||||||
|
from django.utils.translation import gettext_lazy as _
|
||||||
from drf_spectacular.types import OpenApiTypes
|
from drf_spectacular.types import OpenApiTypes
|
||||||
from drf_spectacular.utils import OpenApiParameter, extend_schema
|
from drf_spectacular.utils import OpenApiParameter, extend_schema
|
||||||
from rest_framework.fields import (
|
from rest_framework.fields import (
|
||||||
@ -40,7 +41,11 @@ class DeviceSerializer(MetaNameSerializer):
|
|||||||
def get_extra_description(self, instance: Device) -> str:
|
def get_extra_description(self, instance: Device) -> str:
|
||||||
"""Get extra description"""
|
"""Get extra description"""
|
||||||
if isinstance(instance, WebAuthnDevice):
|
if isinstance(instance, WebAuthnDevice):
|
||||||
return instance.device_type.description
|
return (
|
||||||
|
instance.device_type.description
|
||||||
|
if instance.device_type
|
||||||
|
else _("Extra description not available")
|
||||||
|
)
|
||||||
if isinstance(instance, EndpointDevice):
|
if isinstance(instance, EndpointDevice):
|
||||||
return instance.data.get("deviceSignals", {}).get("deviceModel")
|
return instance.data.get("deviceSignals", {}).get("deviceModel")
|
||||||
return ""
|
return ""
|
||||||
|
@ -1,10 +1,12 @@
|
|||||||
"""transactional application and provider creation"""
|
"""transactional application and provider creation"""
|
||||||
|
|
||||||
from django.apps import apps
|
from django.apps import apps
|
||||||
|
from django.db.models import Model
|
||||||
|
from django.utils.translation import gettext as _
|
||||||
from drf_spectacular.utils import PolymorphicProxySerializer, extend_schema, extend_schema_field
|
from drf_spectacular.utils import PolymorphicProxySerializer, extend_schema, extend_schema_field
|
||||||
from rest_framework.exceptions import ValidationError
|
from rest_framework.exceptions import PermissionDenied, ValidationError
|
||||||
from rest_framework.fields import BooleanField, CharField, ChoiceField, DictField, ListField
|
from rest_framework.fields import BooleanField, CharField, ChoiceField, DictField, ListField
|
||||||
from rest_framework.permissions import IsAdminUser
|
from rest_framework.permissions import IsAuthenticated
|
||||||
from rest_framework.request import Request
|
from rest_framework.request import Request
|
||||||
from rest_framework.response import Response
|
from rest_framework.response import Response
|
||||||
from rest_framework.views import APIView
|
from rest_framework.views import APIView
|
||||||
@ -22,6 +24,7 @@ from authentik.core.api.applications import ApplicationSerializer
|
|||||||
from authentik.core.api.utils import PassiveSerializer
|
from authentik.core.api.utils import PassiveSerializer
|
||||||
from authentik.core.models import Provider
|
from authentik.core.models import Provider
|
||||||
from authentik.lib.utils.reflection import all_subclasses
|
from authentik.lib.utils.reflection import all_subclasses
|
||||||
|
from authentik.policies.api.bindings import PolicyBindingSerializer
|
||||||
|
|
||||||
|
|
||||||
def get_provider_serializer_mapping():
|
def get_provider_serializer_mapping():
|
||||||
@ -45,6 +48,13 @@ class TransactionProviderField(DictField):
|
|||||||
"""Dictionary field which can hold provider creation data"""
|
"""Dictionary field which can hold provider creation data"""
|
||||||
|
|
||||||
|
|
||||||
|
class TransactionPolicyBindingSerializer(PolicyBindingSerializer):
|
||||||
|
"""PolicyBindingSerializer which does not require target as target is set implicitly"""
|
||||||
|
|
||||||
|
class Meta(PolicyBindingSerializer.Meta):
|
||||||
|
fields = [x for x in PolicyBindingSerializer.Meta.fields if x != "target"]
|
||||||
|
|
||||||
|
|
||||||
class TransactionApplicationSerializer(PassiveSerializer):
|
class TransactionApplicationSerializer(PassiveSerializer):
|
||||||
"""Serializer for creating a provider and an application in one transaction"""
|
"""Serializer for creating a provider and an application in one transaction"""
|
||||||
|
|
||||||
@ -52,6 +62,8 @@ class TransactionApplicationSerializer(PassiveSerializer):
|
|||||||
provider_model = ChoiceField(choices=list(get_provider_serializer_mapping().keys()))
|
provider_model = ChoiceField(choices=list(get_provider_serializer_mapping().keys()))
|
||||||
provider = TransactionProviderField()
|
provider = TransactionProviderField()
|
||||||
|
|
||||||
|
policy_bindings = TransactionPolicyBindingSerializer(many=True, required=False)
|
||||||
|
|
||||||
_provider_model: type[Provider] = None
|
_provider_model: type[Provider] = None
|
||||||
|
|
||||||
def validate_provider_model(self, fq_model_name: str) -> str:
|
def validate_provider_model(self, fq_model_name: str) -> str:
|
||||||
@ -96,6 +108,19 @@ class TransactionApplicationSerializer(PassiveSerializer):
|
|||||||
id="app",
|
id="app",
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
for binding in attrs.get("policy_bindings", []):
|
||||||
|
binding["target"] = KeyOf(None, ScalarNode(tag="", value="app"))
|
||||||
|
for key, value in binding.items():
|
||||||
|
if not isinstance(value, Model):
|
||||||
|
continue
|
||||||
|
binding[key] = value.pk
|
||||||
|
blueprint.entries.append(
|
||||||
|
BlueprintEntry(
|
||||||
|
model="authentik_policies.policybinding",
|
||||||
|
state=BlueprintEntryDesiredState.MUST_CREATED,
|
||||||
|
identifiers=binding,
|
||||||
|
)
|
||||||
|
)
|
||||||
importer = Importer(blueprint, {})
|
importer = Importer(blueprint, {})
|
||||||
try:
|
try:
|
||||||
valid, _ = importer.validate(raise_validation_errors=True)
|
valid, _ = importer.validate(raise_validation_errors=True)
|
||||||
@ -120,8 +145,7 @@ class TransactionApplicationResponseSerializer(PassiveSerializer):
|
|||||||
class TransactionalApplicationView(APIView):
|
class TransactionalApplicationView(APIView):
|
||||||
"""Create provider and application and attach them in a single transaction"""
|
"""Create provider and application and attach them in a single transaction"""
|
||||||
|
|
||||||
# TODO: Migrate to a more specific permission
|
permission_classes = [IsAuthenticated]
|
||||||
permission_classes = [IsAdminUser]
|
|
||||||
|
|
||||||
@extend_schema(
|
@extend_schema(
|
||||||
request=TransactionApplicationSerializer(),
|
request=TransactionApplicationSerializer(),
|
||||||
@ -133,8 +157,23 @@ class TransactionalApplicationView(APIView):
|
|||||||
"""Convert data into a blueprint, validate it and apply it"""
|
"""Convert data into a blueprint, validate it and apply it"""
|
||||||
data = TransactionApplicationSerializer(data=request.data)
|
data = TransactionApplicationSerializer(data=request.data)
|
||||||
data.is_valid(raise_exception=True)
|
data.is_valid(raise_exception=True)
|
||||||
|
blueprint: Blueprint = data.validated_data
|
||||||
importer = Importer(data.validated_data, {})
|
for entry in blueprint.entries:
|
||||||
|
full_model = entry.get_model(blueprint)
|
||||||
|
app, __, model = full_model.partition(".")
|
||||||
|
if not request.user.has_perm(f"{app}.add_{model}"):
|
||||||
|
raise PermissionDenied(
|
||||||
|
{
|
||||||
|
entry.id: _(
|
||||||
|
"User lacks permission to create {model}".format_map(
|
||||||
|
{
|
||||||
|
"model": full_model,
|
||||||
|
}
|
||||||
|
)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
)
|
||||||
|
importer = Importer(blueprint, {})
|
||||||
applied = importer.apply()
|
applied = importer.apply()
|
||||||
response = {"applied": False, "logs": []}
|
response = {"applied": False, "logs": []}
|
||||||
response["applied"] = applied
|
response["applied"] = applied
|
||||||
|
@ -666,7 +666,12 @@ class UserViewSet(UsedByMixin, ModelViewSet):
|
|||||||
|
|
||||||
@permission_required("authentik_core.impersonate")
|
@permission_required("authentik_core.impersonate")
|
||||||
@extend_schema(
|
@extend_schema(
|
||||||
request=OpenApiTypes.NONE,
|
request=inline_serializer(
|
||||||
|
"ImpersonationSerializer",
|
||||||
|
{
|
||||||
|
"reason": CharField(required=True),
|
||||||
|
},
|
||||||
|
),
|
||||||
responses={
|
responses={
|
||||||
"204": OpenApiResponse(description="Successfully started impersonation"),
|
"204": OpenApiResponse(description="Successfully started impersonation"),
|
||||||
"401": OpenApiResponse(description="Access denied"),
|
"401": OpenApiResponse(description="Access denied"),
|
||||||
@ -679,6 +684,7 @@ class UserViewSet(UsedByMixin, ModelViewSet):
|
|||||||
LOGGER.debug("User attempted to impersonate", user=request.user)
|
LOGGER.debug("User attempted to impersonate", user=request.user)
|
||||||
return Response(status=401)
|
return Response(status=401)
|
||||||
user_to_be = self.get_object()
|
user_to_be = self.get_object()
|
||||||
|
reason = request.data.get("reason", "")
|
||||||
# Check both object-level perms and global perms
|
# Check both object-level perms and global perms
|
||||||
if not request.user.has_perm(
|
if not request.user.has_perm(
|
||||||
"authentik_core.impersonate", user_to_be
|
"authentik_core.impersonate", user_to_be
|
||||||
@ -688,11 +694,16 @@ class UserViewSet(UsedByMixin, ModelViewSet):
|
|||||||
if user_to_be.pk == self.request.user.pk:
|
if user_to_be.pk == self.request.user.pk:
|
||||||
LOGGER.debug("User attempted to impersonate themselves", user=request.user)
|
LOGGER.debug("User attempted to impersonate themselves", user=request.user)
|
||||||
return Response(status=401)
|
return Response(status=401)
|
||||||
|
if not reason and request.tenant.impersonation_require_reason:
|
||||||
|
LOGGER.debug(
|
||||||
|
"User attempted to impersonate without providing a reason", user=request.user
|
||||||
|
)
|
||||||
|
return Response(status=401)
|
||||||
|
|
||||||
request.session[SESSION_KEY_IMPERSONATE_ORIGINAL_USER] = request.user
|
request.session[SESSION_KEY_IMPERSONATE_ORIGINAL_USER] = request.user
|
||||||
request.session[SESSION_KEY_IMPERSONATE_USER] = user_to_be
|
request.session[SESSION_KEY_IMPERSONATE_USER] = user_to_be
|
||||||
|
|
||||||
Event.new(EventAction.IMPERSONATION_STARTED).from_http(request, user_to_be)
|
Event.new(EventAction.IMPERSONATION_STARTED, reason=reason).from_http(request, user_to_be)
|
||||||
|
|
||||||
return Response(status=201)
|
return Response(status=201)
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@ from contextvars import ContextVar
|
|||||||
from uuid import uuid4
|
from uuid import uuid4
|
||||||
|
|
||||||
from django.http import HttpRequest, HttpResponse
|
from django.http import HttpRequest, HttpResponse
|
||||||
from django.utils.translation import activate
|
from django.utils.translation import override
|
||||||
from sentry_sdk.api import set_tag
|
from sentry_sdk.api import set_tag
|
||||||
from structlog.contextvars import STRUCTLOG_KEY_PREFIX
|
from structlog.contextvars import STRUCTLOG_KEY_PREFIX
|
||||||
|
|
||||||
@ -31,17 +31,19 @@ class ImpersonateMiddleware:
|
|||||||
def __call__(self, request: HttpRequest) -> HttpResponse:
|
def __call__(self, request: HttpRequest) -> HttpResponse:
|
||||||
# No permission checks are done here, they need to be checked before
|
# No permission checks are done here, they need to be checked before
|
||||||
# SESSION_KEY_IMPERSONATE_USER is set.
|
# SESSION_KEY_IMPERSONATE_USER is set.
|
||||||
|
locale_to_set = None
|
||||||
if request.user.is_authenticated:
|
if request.user.is_authenticated:
|
||||||
locale = request.user.locale(request)
|
locale = request.user.locale(request)
|
||||||
if locale != "":
|
if locale != "":
|
||||||
activate(locale)
|
locale_to_set = locale
|
||||||
|
|
||||||
if SESSION_KEY_IMPERSONATE_USER in request.session:
|
if SESSION_KEY_IMPERSONATE_USER in request.session:
|
||||||
request.user = request.session[SESSION_KEY_IMPERSONATE_USER]
|
request.user = request.session[SESSION_KEY_IMPERSONATE_USER]
|
||||||
# Ensure that the user is active, otherwise nothing will work
|
# Ensure that the user is active, otherwise nothing will work
|
||||||
request.user.is_active = True
|
request.user.is_active = True
|
||||||
|
|
||||||
return self.get_response(request)
|
with override(locale_to_set):
|
||||||
|
return self.get_response(request)
|
||||||
|
|
||||||
|
|
||||||
class RequestIDMiddleware:
|
class RequestIDMiddleware:
|
||||||
|
@ -129,6 +129,11 @@ class SourceFlowManager:
|
|||||||
)
|
)
|
||||||
new_connection.user = self.request.user
|
new_connection.user = self.request.user
|
||||||
new_connection = self.update_user_connection(new_connection, **kwargs)
|
new_connection = self.update_user_connection(new_connection, **kwargs)
|
||||||
|
if existing := self.user_connection_type.objects.filter(
|
||||||
|
source=self.source, identifier=self.identifier
|
||||||
|
).first():
|
||||||
|
existing = self.update_user_connection(existing)
|
||||||
|
return Action.AUTH, existing
|
||||||
return Action.LINK, new_connection
|
return Action.LINK, new_connection
|
||||||
|
|
||||||
action, connection = self.matcher.get_user_action(self.identifier, self.user_properties)
|
action, connection = self.matcher.get_user_action(self.identifier, self.user_properties)
|
||||||
|
@ -15,8 +15,8 @@
|
|||||||
{% endblock %}
|
{% endblock %}
|
||||||
<link rel="stylesheet" type="text/css" href="{% static 'dist/authentik.css' %}">
|
<link rel="stylesheet" type="text/css" href="{% static 'dist/authentik.css' %}">
|
||||||
<link rel="stylesheet" type="text/css" href="{% static 'dist/custom.css' %}" data-inject>
|
<link rel="stylesheet" type="text/css" href="{% static 'dist/custom.css' %}" data-inject>
|
||||||
{% versioned_script "dist/poly-%v.js" %}
|
<script src="{% versioned_script 'dist/poly-%v.js' %}" type="module"></script>
|
||||||
{% versioned_script "dist/standalone/loading/index-%v.js" %}
|
<script src="{% versioned_script 'dist/standalone/loading/index-%v.js' %}" type="module"></script>
|
||||||
{% block head %}
|
{% block head %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
<meta name="sentry-trace" content="{{ sentry_trace }}" />
|
<meta name="sentry-trace" content="{{ sentry_trace }}" />
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
{% load authentik_core %}
|
{% load authentik_core %}
|
||||||
|
|
||||||
{% block head %}
|
{% block head %}
|
||||||
{% versioned_script "dist/admin/AdminInterface-%v.js" %}
|
<script src="{% versioned_script 'dist/admin/AdminInterface-%v.js' %}" type="module"></script>
|
||||||
<meta name="theme-color" content="#18191a" media="(prefers-color-scheme: dark)">
|
<meta name="theme-color" content="#18191a" media="(prefers-color-scheme: dark)">
|
||||||
<meta name="theme-color" content="#ffffff" media="(prefers-color-scheme: light)">
|
<meta name="theme-color" content="#ffffff" media="(prefers-color-scheme: light)">
|
||||||
{% include "base/header_js.html" %}
|
{% include "base/header_js.html" %}
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
{% load authentik_core %}
|
{% load authentik_core %}
|
||||||
|
|
||||||
{% block head %}
|
{% block head %}
|
||||||
{% versioned_script "dist/user/UserInterface-%v.js" %}
|
<script src="{% versioned_script 'dist/user/UserInterface-%v.js' %}" type="module"></script>
|
||||||
<meta name="theme-color" content="#1c1e21" media="(prefers-color-scheme: light)">
|
<meta name="theme-color" content="#1c1e21" media="(prefers-color-scheme: light)">
|
||||||
<meta name="theme-color" content="#1c1e21" media="(prefers-color-scheme: dark)">
|
<meta name="theme-color" content="#1c1e21" media="(prefers-color-scheme: dark)">
|
||||||
{% include "base/header_js.html" %}
|
{% include "base/header_js.html" %}
|
||||||
|
@ -2,7 +2,6 @@
|
|||||||
|
|
||||||
from django import template
|
from django import template
|
||||||
from django.templatetags.static import static as static_loader
|
from django.templatetags.static import static as static_loader
|
||||||
from django.utils.safestring import mark_safe
|
|
||||||
|
|
||||||
from authentik import get_full_version
|
from authentik import get_full_version
|
||||||
|
|
||||||
@ -12,10 +11,4 @@ register = template.Library()
|
|||||||
@register.simple_tag()
|
@register.simple_tag()
|
||||||
def versioned_script(path: str) -> str:
|
def versioned_script(path: str) -> str:
|
||||||
"""Wrapper around {% static %} tag that supports setting the version"""
|
"""Wrapper around {% static %} tag that supports setting the version"""
|
||||||
returned_lines = [
|
return static_loader(path.replace("%v", get_full_version()))
|
||||||
(
|
|
||||||
f'<script src="{static_loader(path.replace("%v", get_full_version()))}'
|
|
||||||
'" type="module"></script>'
|
|
||||||
),
|
|
||||||
]
|
|
||||||
return mark_safe("".join(returned_lines)) # nosec
|
|
||||||
|
@ -29,7 +29,8 @@ class TestImpersonation(APITestCase):
|
|||||||
reverse(
|
reverse(
|
||||||
"authentik_api:user-impersonate",
|
"authentik_api:user-impersonate",
|
||||||
kwargs={"pk": self.other_user.pk},
|
kwargs={"pk": self.other_user.pk},
|
||||||
)
|
),
|
||||||
|
data={"reason": "some reason"},
|
||||||
)
|
)
|
||||||
|
|
||||||
response = self.client.get(reverse("authentik_api:user-me"))
|
response = self.client.get(reverse("authentik_api:user-me"))
|
||||||
@ -55,7 +56,8 @@ class TestImpersonation(APITestCase):
|
|||||||
reverse(
|
reverse(
|
||||||
"authentik_api:user-impersonate",
|
"authentik_api:user-impersonate",
|
||||||
kwargs={"pk": self.other_user.pk},
|
kwargs={"pk": self.other_user.pk},
|
||||||
)
|
),
|
||||||
|
data={"reason": "some reason"},
|
||||||
)
|
)
|
||||||
self.assertEqual(response.status_code, 201)
|
self.assertEqual(response.status_code, 201)
|
||||||
|
|
||||||
@ -75,7 +77,8 @@ class TestImpersonation(APITestCase):
|
|||||||
reverse(
|
reverse(
|
||||||
"authentik_api:user-impersonate",
|
"authentik_api:user-impersonate",
|
||||||
kwargs={"pk": self.other_user.pk},
|
kwargs={"pk": self.other_user.pk},
|
||||||
)
|
),
|
||||||
|
data={"reason": "some reason"},
|
||||||
)
|
)
|
||||||
self.assertEqual(response.status_code, 201)
|
self.assertEqual(response.status_code, 201)
|
||||||
|
|
||||||
@ -89,7 +92,8 @@ class TestImpersonation(APITestCase):
|
|||||||
self.client.force_login(self.other_user)
|
self.client.force_login(self.other_user)
|
||||||
|
|
||||||
response = self.client.post(
|
response = self.client.post(
|
||||||
reverse("authentik_api:user-impersonate", kwargs={"pk": self.user.pk})
|
reverse("authentik_api:user-impersonate", kwargs={"pk": self.user.pk}),
|
||||||
|
data={"reason": "some reason"},
|
||||||
)
|
)
|
||||||
self.assertEqual(response.status_code, 403)
|
self.assertEqual(response.status_code, 403)
|
||||||
|
|
||||||
@ -105,7 +109,8 @@ class TestImpersonation(APITestCase):
|
|||||||
self.client.force_login(self.user)
|
self.client.force_login(self.user)
|
||||||
|
|
||||||
response = self.client.post(
|
response = self.client.post(
|
||||||
reverse("authentik_api:user-impersonate", kwargs={"pk": self.other_user.pk})
|
reverse("authentik_api:user-impersonate", kwargs={"pk": self.other_user.pk}),
|
||||||
|
data={"reason": "some reason"},
|
||||||
)
|
)
|
||||||
self.assertEqual(response.status_code, 401)
|
self.assertEqual(response.status_code, 401)
|
||||||
|
|
||||||
@ -118,7 +123,22 @@ class TestImpersonation(APITestCase):
|
|||||||
self.client.force_login(self.user)
|
self.client.force_login(self.user)
|
||||||
|
|
||||||
response = self.client.post(
|
response = self.client.post(
|
||||||
reverse("authentik_api:user-impersonate", kwargs={"pk": self.user.pk})
|
reverse("authentik_api:user-impersonate", kwargs={"pk": self.user.pk}),
|
||||||
|
data={"reason": "some reason"},
|
||||||
|
)
|
||||||
|
self.assertEqual(response.status_code, 401)
|
||||||
|
|
||||||
|
response = self.client.get(reverse("authentik_api:user-me"))
|
||||||
|
response_body = loads(response.content.decode())
|
||||||
|
self.assertEqual(response_body["user"]["username"], self.user.username)
|
||||||
|
|
||||||
|
def test_impersonate_reason_required(self):
|
||||||
|
"""test impersonation that user must provide reason"""
|
||||||
|
self.client.force_login(self.user)
|
||||||
|
|
||||||
|
response = self.client.post(
|
||||||
|
reverse("authentik_api:user-impersonate", kwargs={"pk": self.user.pk}),
|
||||||
|
data={"reason": ""},
|
||||||
)
|
)
|
||||||
self.assertEqual(response.status_code, 401)
|
self.assertEqual(response.status_code, 401)
|
||||||
|
|
||||||
|
@ -81,6 +81,22 @@ class TestSourceFlowManager(TestCase):
|
|||||||
reverse("authentik_core:if-user") + "#/settings;page-sources",
|
reverse("authentik_core:if-user") + "#/settings;page-sources",
|
||||||
)
|
)
|
||||||
|
|
||||||
|
def test_authenticated_auth(self):
|
||||||
|
"""Test authenticated user linking"""
|
||||||
|
user = User.objects.create(username="foo", email="foo@bar.baz")
|
||||||
|
UserOAuthSourceConnection.objects.create(
|
||||||
|
user=user, source=self.source, identifier=self.identifier
|
||||||
|
)
|
||||||
|
request = get_request("/", user=user)
|
||||||
|
flow_manager = OAuthSourceFlowManager(
|
||||||
|
self.source, request, self.identifier, {"info": {}}, {}
|
||||||
|
)
|
||||||
|
action, connection = flow_manager.get_action()
|
||||||
|
self.assertEqual(action, Action.AUTH)
|
||||||
|
self.assertIsNotNone(connection.pk)
|
||||||
|
response = flow_manager.get_flow()
|
||||||
|
self.assertEqual(response.status_code, 302)
|
||||||
|
|
||||||
def test_unauthenticated_link(self):
|
def test_unauthenticated_link(self):
|
||||||
"""Test un-authenticated user linking"""
|
"""Test un-authenticated user linking"""
|
||||||
flow_manager = OAuthSourceFlowManager(
|
flow_manager = OAuthSourceFlowManager(
|
||||||
|
@ -1,11 +1,13 @@
|
|||||||
"""Test Transactional API"""
|
"""Test Transactional API"""
|
||||||
|
|
||||||
from django.urls import reverse
|
from django.urls import reverse
|
||||||
|
from guardian.shortcuts import assign_perm
|
||||||
from rest_framework.test import APITestCase
|
from rest_framework.test import APITestCase
|
||||||
|
|
||||||
from authentik.core.models import Application
|
from authentik.core.models import Application, Group
|
||||||
from authentik.core.tests.utils import create_test_admin_user, create_test_flow
|
from authentik.core.tests.utils import create_test_flow, create_test_user
|
||||||
from authentik.lib.generators import generate_id
|
from authentik.lib.generators import generate_id
|
||||||
|
from authentik.policies.models import PolicyBinding
|
||||||
from authentik.providers.oauth2.models import OAuth2Provider
|
from authentik.providers.oauth2.models import OAuth2Provider
|
||||||
|
|
||||||
|
|
||||||
@ -13,7 +15,9 @@ class TestTransactionalApplicationsAPI(APITestCase):
|
|||||||
"""Test Transactional API"""
|
"""Test Transactional API"""
|
||||||
|
|
||||||
def setUp(self) -> None:
|
def setUp(self) -> None:
|
||||||
self.user = create_test_admin_user()
|
self.user = create_test_user()
|
||||||
|
assign_perm("authentik_core.add_application", self.user)
|
||||||
|
assign_perm("authentik_providers_oauth2.add_oauth2provider", self.user)
|
||||||
|
|
||||||
def test_create_transactional(self):
|
def test_create_transactional(self):
|
||||||
"""Test transactional Application + provider creation"""
|
"""Test transactional Application + provider creation"""
|
||||||
@ -41,6 +45,65 @@ class TestTransactionalApplicationsAPI(APITestCase):
|
|||||||
self.assertIsNotNone(app)
|
self.assertIsNotNone(app)
|
||||||
self.assertEqual(app.provider.pk, provider.pk)
|
self.assertEqual(app.provider.pk, provider.pk)
|
||||||
|
|
||||||
|
def test_create_transactional_permission_denied(self):
|
||||||
|
"""Test transactional Application + provider creation (missing permissions)"""
|
||||||
|
self.client.force_login(self.user)
|
||||||
|
uid = generate_id()
|
||||||
|
response = self.client.put(
|
||||||
|
reverse("authentik_api:core-transactional-application"),
|
||||||
|
data={
|
||||||
|
"app": {
|
||||||
|
"name": uid,
|
||||||
|
"slug": uid,
|
||||||
|
},
|
||||||
|
"provider_model": "authentik_providers_saml.samlprovider",
|
||||||
|
"provider": {
|
||||||
|
"name": uid,
|
||||||
|
"authorization_flow": str(create_test_flow().pk),
|
||||||
|
"invalidation_flow": str(create_test_flow().pk),
|
||||||
|
"acs_url": "https://goauthentik.io",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
)
|
||||||
|
self.assertJSONEqual(
|
||||||
|
response.content.decode(),
|
||||||
|
{"provider": "User lacks permission to create authentik_providers_saml.samlprovider"},
|
||||||
|
)
|
||||||
|
|
||||||
|
def test_create_transactional_bindings(self):
|
||||||
|
"""Test transactional Application + provider creation"""
|
||||||
|
assign_perm("authentik_policies.add_policybinding", self.user)
|
||||||
|
self.client.force_login(self.user)
|
||||||
|
uid = generate_id()
|
||||||
|
group = Group.objects.create(name=generate_id())
|
||||||
|
authorization_flow = create_test_flow()
|
||||||
|
response = self.client.put(
|
||||||
|
reverse("authentik_api:core-transactional-application"),
|
||||||
|
data={
|
||||||
|
"app": {
|
||||||
|
"name": uid,
|
||||||
|
"slug": uid,
|
||||||
|
},
|
||||||
|
"provider_model": "authentik_providers_oauth2.oauth2provider",
|
||||||
|
"provider": {
|
||||||
|
"name": uid,
|
||||||
|
"authorization_flow": str(authorization_flow.pk),
|
||||||
|
"invalidation_flow": str(authorization_flow.pk),
|
||||||
|
},
|
||||||
|
"policy_bindings": [{"group": group.pk, "order": 0}],
|
||||||
|
},
|
||||||
|
)
|
||||||
|
self.assertJSONEqual(response.content.decode(), {"applied": True, "logs": []})
|
||||||
|
provider = OAuth2Provider.objects.filter(name=uid).first()
|
||||||
|
self.assertIsNotNone(provider)
|
||||||
|
app = Application.objects.filter(slug=uid).first()
|
||||||
|
self.assertIsNotNone(app)
|
||||||
|
self.assertEqual(app.provider.pk, provider.pk)
|
||||||
|
binding = PolicyBinding.objects.filter(target=app).first()
|
||||||
|
self.assertIsNotNone(binding)
|
||||||
|
self.assertEqual(binding.target, app)
|
||||||
|
self.assertEqual(binding.group, group)
|
||||||
|
|
||||||
def test_create_transactional_invalid(self):
|
def test_create_transactional_invalid(self):
|
||||||
"""Test transactional Application + provider creation"""
|
"""Test transactional Application + provider creation"""
|
||||||
self.client.force_login(self.user)
|
self.client.force_login(self.user)
|
||||||
@ -69,3 +132,32 @@ class TestTransactionalApplicationsAPI(APITestCase):
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
|
def test_create_transactional_duplicate_name_provider(self):
|
||||||
|
"""Test transactional Application + provider creation"""
|
||||||
|
self.client.force_login(self.user)
|
||||||
|
uid = generate_id()
|
||||||
|
OAuth2Provider.objects.create(
|
||||||
|
name=uid,
|
||||||
|
authorization_flow=create_test_flow(),
|
||||||
|
invalidation_flow=create_test_flow(),
|
||||||
|
)
|
||||||
|
response = self.client.put(
|
||||||
|
reverse("authentik_api:core-transactional-application"),
|
||||||
|
data={
|
||||||
|
"app": {
|
||||||
|
"name": uid,
|
||||||
|
"slug": uid,
|
||||||
|
},
|
||||||
|
"provider_model": "authentik_providers_oauth2.oauth2provider",
|
||||||
|
"provider": {
|
||||||
|
"name": uid,
|
||||||
|
"authorization_flow": str(create_test_flow().pk),
|
||||||
|
"invalidation_flow": str(create_test_flow().pk),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
)
|
||||||
|
self.assertJSONEqual(
|
||||||
|
response.content.decode(),
|
||||||
|
{"provider": {"name": ["State is set to must_created and object exists already"]}},
|
||||||
|
)
|
||||||
|
@ -24,6 +24,7 @@ from rest_framework.fields import (
|
|||||||
from rest_framework.filters import OrderingFilter, SearchFilter
|
from rest_framework.filters import OrderingFilter, SearchFilter
|
||||||
from rest_framework.request import Request
|
from rest_framework.request import Request
|
||||||
from rest_framework.response import Response
|
from rest_framework.response import Response
|
||||||
|
from rest_framework.validators import UniqueValidator
|
||||||
from rest_framework.viewsets import ModelViewSet
|
from rest_framework.viewsets import ModelViewSet
|
||||||
from structlog.stdlib import get_logger
|
from structlog.stdlib import get_logger
|
||||||
|
|
||||||
@ -181,7 +182,10 @@ class CertificateDataSerializer(PassiveSerializer):
|
|||||||
class CertificateGenerationSerializer(PassiveSerializer):
|
class CertificateGenerationSerializer(PassiveSerializer):
|
||||||
"""Certificate generation parameters"""
|
"""Certificate generation parameters"""
|
||||||
|
|
||||||
common_name = CharField()
|
common_name = CharField(
|
||||||
|
validators=[UniqueValidator(queryset=CertificateKeyPair.objects.all())],
|
||||||
|
source="name",
|
||||||
|
)
|
||||||
subject_alt_name = CharField(required=False, allow_blank=True, label=_("Subject-alt name"))
|
subject_alt_name = CharField(required=False, allow_blank=True, label=_("Subject-alt name"))
|
||||||
validity_days = IntegerField(initial=365)
|
validity_days = IntegerField(initial=365)
|
||||||
alg = ChoiceField(default=PrivateKeyAlg.RSA, choices=PrivateKeyAlg.choices)
|
alg = ChoiceField(default=PrivateKeyAlg.RSA, choices=PrivateKeyAlg.choices)
|
||||||
@ -242,11 +246,10 @@ class CertificateKeyPairViewSet(UsedByMixin, ModelViewSet):
|
|||||||
def generate(self, request: Request) -> Response:
|
def generate(self, request: Request) -> Response:
|
||||||
"""Generate a new, self-signed certificate-key pair"""
|
"""Generate a new, self-signed certificate-key pair"""
|
||||||
data = CertificateGenerationSerializer(data=request.data)
|
data = CertificateGenerationSerializer(data=request.data)
|
||||||
if not data.is_valid():
|
data.is_valid(raise_exception=True)
|
||||||
return Response(data.errors, status=400)
|
|
||||||
raw_san = data.validated_data.get("subject_alt_name", "")
|
raw_san = data.validated_data.get("subject_alt_name", "")
|
||||||
sans = raw_san.split(",") if raw_san != "" else []
|
sans = raw_san.split(",") if raw_san != "" else []
|
||||||
builder = CertificateBuilder(data.validated_data["common_name"])
|
builder = CertificateBuilder(data.validated_data["name"])
|
||||||
builder.alg = data.validated_data["alg"]
|
builder.alg = data.validated_data["alg"]
|
||||||
builder.build(
|
builder.build(
|
||||||
subject_alt_names=sans,
|
subject_alt_names=sans,
|
||||||
|
@ -89,6 +89,17 @@ class TestCrypto(APITestCase):
|
|||||||
self.assertIsInstance(ext[1], DNSName)
|
self.assertIsInstance(ext[1], DNSName)
|
||||||
self.assertEqual(ext[1].value, "baz")
|
self.assertEqual(ext[1].value, "baz")
|
||||||
|
|
||||||
|
def test_builder_api_duplicate(self):
|
||||||
|
"""Test Builder (via API)"""
|
||||||
|
cert = create_test_cert()
|
||||||
|
self.client.force_login(create_test_admin_user())
|
||||||
|
res = self.client.post(
|
||||||
|
reverse("authentik_api:certificatekeypair-generate"),
|
||||||
|
data={"common_name": cert.name, "subject_alt_name": "bar,baz", "validity_days": 3},
|
||||||
|
)
|
||||||
|
self.assertEqual(res.status_code, 400)
|
||||||
|
self.assertJSONEqual(res.content, {"common_name": ["This field must be unique."]})
|
||||||
|
|
||||||
def test_builder_api_empty_san(self):
|
def test_builder_api_empty_san(self):
|
||||||
"""Test Builder (via API)"""
|
"""Test Builder (via API)"""
|
||||||
self.client.force_login(create_test_admin_user())
|
self.client.force_login(create_test_admin_user())
|
||||||
|
@ -16,13 +16,28 @@ class RACProviderSerializer(EnterpriseRequiredMixin, ProviderSerializer):
|
|||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
model = RACProvider
|
model = RACProvider
|
||||||
fields = ProviderSerializer.Meta.fields + [
|
fields = [
|
||||||
|
"pk",
|
||||||
|
"name",
|
||||||
|
"authentication_flow",
|
||||||
|
"authorization_flow",
|
||||||
|
"property_mappings",
|
||||||
|
"component",
|
||||||
|
"assigned_application_slug",
|
||||||
|
"assigned_application_name",
|
||||||
|
"assigned_backchannel_application_slug",
|
||||||
|
"assigned_backchannel_application_name",
|
||||||
|
"verbose_name",
|
||||||
|
"verbose_name_plural",
|
||||||
|
"meta_model_name",
|
||||||
"settings",
|
"settings",
|
||||||
"outpost_set",
|
"outpost_set",
|
||||||
"connection_expiry",
|
"connection_expiry",
|
||||||
"delete_token_on_disconnect",
|
"delete_token_on_disconnect",
|
||||||
]
|
]
|
||||||
extra_kwargs = ProviderSerializer.Meta.extra_kwargs
|
extra_kwargs = {
|
||||||
|
"authorization_flow": {"required": True, "allow_null": False},
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
class RACProviderViewSet(UsedByMixin, ModelViewSet):
|
class RACProviderViewSet(UsedByMixin, ModelViewSet):
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
{% load authentik_core %}
|
{% load authentik_core %}
|
||||||
|
|
||||||
{% block head %}
|
{% block head %}
|
||||||
{% versioned_script "dist/enterprise/rac/index-%v.js" %}
|
<script src="{% versioned_script 'dist/enterprise/rac/index-%v.js' %}" type="module"></script>
|
||||||
<meta name="theme-color" content="#18191a" media="(prefers-color-scheme: dark)">
|
<meta name="theme-color" content="#18191a" media="(prefers-color-scheme: dark)">
|
||||||
<meta name="theme-color" content="#ffffff" media="(prefers-color-scheme: light)">
|
<meta name="theme-color" content="#ffffff" media="(prefers-color-scheme: light)">
|
||||||
<link rel="icon" href="{{ tenant.branding_favicon }}">
|
<link rel="icon" href="{{ tenant.branding_favicon }}">
|
||||||
|
46
authentik/enterprise/providers/rac/tests/test_api.py
Normal file
46
authentik/enterprise/providers/rac/tests/test_api.py
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
"""Test RAC Provider"""
|
||||||
|
|
||||||
|
from datetime import timedelta
|
||||||
|
from time import mktime
|
||||||
|
from unittest.mock import MagicMock, patch
|
||||||
|
|
||||||
|
from django.urls import reverse
|
||||||
|
from django.utils.timezone import now
|
||||||
|
from rest_framework.test import APITestCase
|
||||||
|
|
||||||
|
from authentik.core.tests.utils import create_test_admin_user, create_test_flow
|
||||||
|
from authentik.enterprise.license import LicenseKey
|
||||||
|
from authentik.enterprise.models import License
|
||||||
|
from authentik.lib.generators import generate_id
|
||||||
|
|
||||||
|
|
||||||
|
class TestAPI(APITestCase):
|
||||||
|
"""Test Provider API"""
|
||||||
|
|
||||||
|
def setUp(self) -> None:
|
||||||
|
self.user = create_test_admin_user()
|
||||||
|
|
||||||
|
@patch(
|
||||||
|
"authentik.enterprise.license.LicenseKey.validate",
|
||||||
|
MagicMock(
|
||||||
|
return_value=LicenseKey(
|
||||||
|
aud="",
|
||||||
|
exp=int(mktime((now() + timedelta(days=3000)).timetuple())),
|
||||||
|
name=generate_id(),
|
||||||
|
internal_users=100,
|
||||||
|
external_users=100,
|
||||||
|
)
|
||||||
|
),
|
||||||
|
)
|
||||||
|
def test_create(self):
|
||||||
|
"""Test creation of RAC Provider"""
|
||||||
|
License.objects.create(key=generate_id())
|
||||||
|
self.client.force_login(self.user)
|
||||||
|
response = self.client.post(
|
||||||
|
reverse("authentik_api:racprovider-list"),
|
||||||
|
data={
|
||||||
|
"name": generate_id(),
|
||||||
|
"authorization_flow": create_test_flow().pk,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
self.assertEqual(response.status_code, 201)
|
@ -68,7 +68,6 @@ class TestEndpointsAPI(APITestCase):
|
|||||||
"name": self.provider.name,
|
"name": self.provider.name,
|
||||||
"authentication_flow": None,
|
"authentication_flow": None,
|
||||||
"authorization_flow": None,
|
"authorization_flow": None,
|
||||||
"invalidation_flow": None,
|
|
||||||
"property_mappings": [],
|
"property_mappings": [],
|
||||||
"connection_expiry": "hours=8",
|
"connection_expiry": "hours=8",
|
||||||
"delete_token_on_disconnect": False,
|
"delete_token_on_disconnect": False,
|
||||||
@ -121,7 +120,6 @@ class TestEndpointsAPI(APITestCase):
|
|||||||
"name": self.provider.name,
|
"name": self.provider.name,
|
||||||
"authentication_flow": None,
|
"authentication_flow": None,
|
||||||
"authorization_flow": None,
|
"authorization_flow": None,
|
||||||
"invalidation_flow": None,
|
|
||||||
"property_mappings": [],
|
"property_mappings": [],
|
||||||
"component": "ak-provider-rac-form",
|
"component": "ak-provider-rac-form",
|
||||||
"assigned_application_slug": self.app.slug,
|
"assigned_application_slug": self.app.slug,
|
||||||
@ -151,7 +149,6 @@ class TestEndpointsAPI(APITestCase):
|
|||||||
"name": self.provider.name,
|
"name": self.provider.name,
|
||||||
"authentication_flow": None,
|
"authentication_flow": None,
|
||||||
"authorization_flow": None,
|
"authorization_flow": None,
|
||||||
"invalidation_flow": None,
|
|
||||||
"property_mappings": [],
|
"property_mappings": [],
|
||||||
"component": "ak-provider-rac-form",
|
"component": "ak-provider-rac-form",
|
||||||
"assigned_application_slug": self.app.slug,
|
"assigned_application_slug": self.app.slug,
|
||||||
|
@ -60,7 +60,7 @@ def default_event_duration():
|
|||||||
"""Default duration an Event is saved.
|
"""Default duration an Event is saved.
|
||||||
This is used as a fallback when no brand is available"""
|
This is used as a fallback when no brand is available"""
|
||||||
try:
|
try:
|
||||||
tenant = get_current_tenant()
|
tenant = get_current_tenant(only=["event_retention"])
|
||||||
return now() + timedelta_from_string(tenant.event_retention)
|
return now() + timedelta_from_string(tenant.event_retention)
|
||||||
except Tenant.DoesNotExist:
|
except Tenant.DoesNotExist:
|
||||||
return now() + timedelta(days=365)
|
return now() + timedelta(days=365)
|
||||||
|
@ -18,7 +18,7 @@ window.authentik.flow = {
|
|||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block head %}
|
{% block head %}
|
||||||
{% versioned_script "dist/flow/FlowInterface-%v.js" %}
|
<script src="{% versioned_script 'dist/flow/FlowInterface-%v.js' %}" type="module"></script>
|
||||||
<style>
|
<style>
|
||||||
:root {
|
:root {
|
||||||
--ak-flow-background: url("{{ flow.background_url }}");
|
--ak-flow-background: url("{{ flow.background_url }}");
|
||||||
|
@ -89,6 +89,10 @@ class PasswordPolicy(Policy):
|
|||||||
|
|
||||||
def passes_static(self, password: str, request: PolicyRequest) -> PolicyResult:
|
def passes_static(self, password: str, request: PolicyRequest) -> PolicyResult:
|
||||||
"""Check static rules"""
|
"""Check static rules"""
|
||||||
|
error_message = self.error_message
|
||||||
|
if error_message == "":
|
||||||
|
error_message = _("Invalid password.")
|
||||||
|
|
||||||
if len(password) < self.length_min:
|
if len(password) < self.length_min:
|
||||||
LOGGER.debug("password failed", check="static", reason="length")
|
LOGGER.debug("password failed", check="static", reason="length")
|
||||||
return PolicyResult(False, self.error_message)
|
return PolicyResult(False, self.error_message)
|
||||||
|
@ -159,7 +159,10 @@ class LDAPOutpostConfigViewSet(ListModelMixin, GenericViewSet):
|
|||||||
access_response = PolicyResult(result.passing)
|
access_response = PolicyResult(result.passing)
|
||||||
response = self.LDAPCheckAccessSerializer(
|
response = self.LDAPCheckAccessSerializer(
|
||||||
instance={
|
instance={
|
||||||
"has_search_permission": request.user.has_perm("search_full_directory", provider),
|
"has_search_permission": (
|
||||||
|
request.user.has_perm("search_full_directory", provider)
|
||||||
|
or request.user.has_perm("authentik_providers_ldap.search_full_directory")
|
||||||
|
),
|
||||||
"access": access_response,
|
"access": access_response,
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
@ -11,13 +11,16 @@ class Migration(migrations.Migration):
|
|||||||
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||||
]
|
]
|
||||||
|
|
||||||
operations = [
|
# Original preserved
|
||||||
migrations.AddIndex(
|
# See https://github.com/goauthentik/authentik/issues/11874
|
||||||
model_name="accesstoken",
|
# operations = [
|
||||||
index=models.Index(fields=["token"], name="authentik_p_token_4bc870_idx"),
|
# migrations.AddIndex(
|
||||||
),
|
# model_name="accesstoken",
|
||||||
migrations.AddIndex(
|
# index=models.Index(fields=["token"], name="authentik_p_token_4bc870_idx"),
|
||||||
model_name="refreshtoken",
|
# ),
|
||||||
index=models.Index(fields=["token"], name="authentik_p_token_1a841f_idx"),
|
# migrations.AddIndex(
|
||||||
),
|
# model_name="refreshtoken",
|
||||||
]
|
# index=models.Index(fields=["token"], name="authentik_p_token_1a841f_idx"),
|
||||||
|
# ),
|
||||||
|
# ]
|
||||||
|
operations = []
|
||||||
|
@ -11,21 +11,24 @@ class Migration(migrations.Migration):
|
|||||||
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||||
]
|
]
|
||||||
|
|
||||||
operations = [
|
# Original preserved
|
||||||
migrations.RemoveIndex(
|
# See https://github.com/goauthentik/authentik/issues/11874
|
||||||
model_name="accesstoken",
|
# operations = [
|
||||||
name="authentik_p_token_4bc870_idx",
|
# migrations.RemoveIndex(
|
||||||
),
|
# model_name="accesstoken",
|
||||||
migrations.RemoveIndex(
|
# name="authentik_p_token_4bc870_idx",
|
||||||
model_name="refreshtoken",
|
# ),
|
||||||
name="authentik_p_token_1a841f_idx",
|
# migrations.RemoveIndex(
|
||||||
),
|
# model_name="refreshtoken",
|
||||||
migrations.AddIndex(
|
# name="authentik_p_token_1a841f_idx",
|
||||||
model_name="accesstoken",
|
# ),
|
||||||
index=models.Index(fields=["token", "provider"], name="authentik_p_token_f99422_idx"),
|
# migrations.AddIndex(
|
||||||
),
|
# model_name="accesstoken",
|
||||||
migrations.AddIndex(
|
# index=models.Index(fields=["token", "provider"], name="authentik_p_token_f99422_idx"),
|
||||||
model_name="refreshtoken",
|
# ),
|
||||||
index=models.Index(fields=["token", "provider"], name="authentik_p_token_a1d921_idx"),
|
# migrations.AddIndex(
|
||||||
),
|
# model_name="refreshtoken",
|
||||||
]
|
# index=models.Index(fields=["token", "provider"], name="authentik_p_token_a1d921_idx"),
|
||||||
|
# ),
|
||||||
|
# ]
|
||||||
|
operations = []
|
||||||
|
@ -0,0 +1,31 @@
|
|||||||
|
# Generated by Django 5.0.9 on 2024-10-31 14:28
|
||||||
|
|
||||||
|
import django.contrib.postgres.indexes
|
||||||
|
from django.conf import settings
|
||||||
|
from django.db import migrations
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("authentik_core", "0040_provider_invalidation_flow"),
|
||||||
|
("authentik_providers_oauth2", "0022_remove_accesstoken_session_id_and_more"),
|
||||||
|
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.RunSQL("DROP INDEX IF EXISTS authentik_p_token_f99422_idx;"),
|
||||||
|
migrations.RunSQL("DROP INDEX IF EXISTS authentik_p_token_a1d921_idx;"),
|
||||||
|
migrations.AddIndex(
|
||||||
|
model_name="accesstoken",
|
||||||
|
index=django.contrib.postgres.indexes.HashIndex(
|
||||||
|
fields=["token"], name="authentik_p_token_e00883_hash"
|
||||||
|
),
|
||||||
|
),
|
||||||
|
migrations.AddIndex(
|
||||||
|
model_name="refreshtoken",
|
||||||
|
index=django.contrib.postgres.indexes.HashIndex(
|
||||||
|
fields=["token"], name="authentik_p_token_32e2b7_hash"
|
||||||
|
),
|
||||||
|
),
|
||||||
|
]
|
@ -13,6 +13,7 @@ from cryptography.hazmat.primitives.asymmetric.ec import EllipticCurvePrivateKey
|
|||||||
from cryptography.hazmat.primitives.asymmetric.rsa import RSAPrivateKey
|
from cryptography.hazmat.primitives.asymmetric.rsa import RSAPrivateKey
|
||||||
from cryptography.hazmat.primitives.asymmetric.types import PrivateKeyTypes
|
from cryptography.hazmat.primitives.asymmetric.types import PrivateKeyTypes
|
||||||
from dacite.core import from_dict
|
from dacite.core import from_dict
|
||||||
|
from django.contrib.postgres.indexes import HashIndex
|
||||||
from django.db import models
|
from django.db import models
|
||||||
from django.http import HttpRequest
|
from django.http import HttpRequest
|
||||||
from django.templatetags.static import static
|
from django.templatetags.static import static
|
||||||
@ -418,7 +419,7 @@ class AccessToken(SerializerModel, ExpiringModel, BaseGrantModel):
|
|||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
indexes = [
|
indexes = [
|
||||||
models.Index(fields=["token", "provider"]),
|
HashIndex(fields=["token"]),
|
||||||
]
|
]
|
||||||
verbose_name = _("OAuth2 Access Token")
|
verbose_name = _("OAuth2 Access Token")
|
||||||
verbose_name_plural = _("OAuth2 Access Tokens")
|
verbose_name_plural = _("OAuth2 Access Tokens")
|
||||||
@ -464,7 +465,7 @@ class RefreshToken(SerializerModel, ExpiringModel, BaseGrantModel):
|
|||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
indexes = [
|
indexes = [
|
||||||
models.Index(fields=["token", "provider"]),
|
HashIndex(fields=["token"]),
|
||||||
]
|
]
|
||||||
verbose_name = _("OAuth2 Refresh Token")
|
verbose_name = _("OAuth2 Refresh Token")
|
||||||
verbose_name_plural = _("OAuth2 Refresh Tokens")
|
verbose_name_plural = _("OAuth2 Refresh Tokens")
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
from urllib.parse import urlencode
|
from urllib.parse import urlencode
|
||||||
|
|
||||||
from django.urls import reverse
|
from django.urls import reverse
|
||||||
|
from rest_framework.test import APIClient
|
||||||
|
|
||||||
from authentik.core.models import Application, Group
|
from authentik.core.models import Application, Group
|
||||||
from authentik.core.tests.utils import create_test_admin_user, create_test_brand, create_test_flow
|
from authentik.core.tests.utils import create_test_admin_user, create_test_brand, create_test_flow
|
||||||
@ -34,7 +35,10 @@ class TesOAuth2DeviceInit(OAuthTestCase):
|
|||||||
self.brand.flow_device_code = self.device_flow
|
self.brand.flow_device_code = self.device_flow
|
||||||
self.brand.save()
|
self.brand.save()
|
||||||
|
|
||||||
def test_device_init(self):
|
self.api_client = APIClient()
|
||||||
|
self.api_client.force_login(self.user)
|
||||||
|
|
||||||
|
def test_device_init_get(self):
|
||||||
"""Test device init"""
|
"""Test device init"""
|
||||||
res = self.client.get(reverse("authentik_providers_oauth2_root:device-login"))
|
res = self.client.get(reverse("authentik_providers_oauth2_root:device-login"))
|
||||||
self.assertEqual(res.status_code, 302)
|
self.assertEqual(res.status_code, 302)
|
||||||
@ -48,6 +52,76 @@ class TesOAuth2DeviceInit(OAuthTestCase):
|
|||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
def test_device_init_post(self):
|
||||||
|
"""Test device init"""
|
||||||
|
res = self.api_client.get(reverse("authentik_providers_oauth2_root:device-login"))
|
||||||
|
self.assertEqual(res.status_code, 302)
|
||||||
|
self.assertEqual(
|
||||||
|
res.url,
|
||||||
|
reverse(
|
||||||
|
"authentik_core:if-flow",
|
||||||
|
kwargs={
|
||||||
|
"flow_slug": self.device_flow.slug,
|
||||||
|
},
|
||||||
|
),
|
||||||
|
)
|
||||||
|
res = self.api_client.get(
|
||||||
|
reverse(
|
||||||
|
"authentik_api:flow-executor",
|
||||||
|
kwargs={
|
||||||
|
"flow_slug": self.device_flow.slug,
|
||||||
|
},
|
||||||
|
),
|
||||||
|
)
|
||||||
|
self.assertEqual(res.status_code, 200)
|
||||||
|
self.assertJSONEqual(
|
||||||
|
res.content,
|
||||||
|
{
|
||||||
|
"component": "ak-provider-oauth2-device-code",
|
||||||
|
"flow_info": {
|
||||||
|
"background": "/static/dist/assets/images/flow_background.jpg",
|
||||||
|
"cancel_url": "/flows/-/cancel/",
|
||||||
|
"layout": "stacked",
|
||||||
|
"title": self.device_flow.title,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
|
provider = OAuth2Provider.objects.create(
|
||||||
|
name=generate_id(),
|
||||||
|
authorization_flow=create_test_flow(),
|
||||||
|
)
|
||||||
|
Application.objects.create(name=generate_id(), slug=generate_id(), provider=provider)
|
||||||
|
token = DeviceToken.objects.create(
|
||||||
|
provider=provider,
|
||||||
|
)
|
||||||
|
|
||||||
|
res = self.api_client.post(
|
||||||
|
reverse(
|
||||||
|
"authentik_api:flow-executor",
|
||||||
|
kwargs={
|
||||||
|
"flow_slug": self.device_flow.slug,
|
||||||
|
},
|
||||||
|
),
|
||||||
|
data={
|
||||||
|
"component": "ak-provider-oauth2-device-code",
|
||||||
|
"code": token.user_code,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
self.assertEqual(res.status_code, 200)
|
||||||
|
self.assertJSONEqual(
|
||||||
|
res.content,
|
||||||
|
{
|
||||||
|
"component": "xak-flow-redirect",
|
||||||
|
"to": reverse(
|
||||||
|
"authentik_core:if-flow",
|
||||||
|
kwargs={
|
||||||
|
"flow_slug": provider.authorization_flow.slug,
|
||||||
|
},
|
||||||
|
),
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
def test_no_flow(self):
|
def test_no_flow(self):
|
||||||
"""Test no flow"""
|
"""Test no flow"""
|
||||||
self.brand.flow_device_code = None
|
self.brand.flow_device_code = None
|
||||||
|
@ -5,7 +5,7 @@ from typing import Any
|
|||||||
from django.http import HttpRequest, HttpResponse
|
from django.http import HttpRequest, HttpResponse
|
||||||
from django.utils.translation import gettext as _
|
from django.utils.translation import gettext as _
|
||||||
from rest_framework.exceptions import ValidationError
|
from rest_framework.exceptions import ValidationError
|
||||||
from rest_framework.fields import CharField, IntegerField
|
from rest_framework.fields import CharField
|
||||||
from structlog.stdlib import get_logger
|
from structlog.stdlib import get_logger
|
||||||
|
|
||||||
from authentik.brands.models import Brand
|
from authentik.brands.models import Brand
|
||||||
@ -47,6 +47,9 @@ class CodeValidatorView(PolicyAccessView):
|
|||||||
self.provider = self.token.provider
|
self.provider = self.token.provider
|
||||||
self.application = self.token.provider.application
|
self.application = self.token.provider.application
|
||||||
|
|
||||||
|
def post(self, request: HttpRequest, *args, **kwargs):
|
||||||
|
return self.get(request, *args, **kwargs)
|
||||||
|
|
||||||
def get(self, request: HttpRequest, *args, **kwargs):
|
def get(self, request: HttpRequest, *args, **kwargs):
|
||||||
scope_descriptions = UserInfoView().get_scope_descriptions(self.token.scope, self.provider)
|
scope_descriptions = UserInfoView().get_scope_descriptions(self.token.scope, self.provider)
|
||||||
planner = FlowPlanner(self.provider.authorization_flow)
|
planner = FlowPlanner(self.provider.authorization_flow)
|
||||||
@ -122,7 +125,7 @@ class OAuthDeviceCodeChallenge(Challenge):
|
|||||||
class OAuthDeviceCodeChallengeResponse(ChallengeResponse):
|
class OAuthDeviceCodeChallengeResponse(ChallengeResponse):
|
||||||
"""Response that includes the user-entered device code"""
|
"""Response that includes the user-entered device code"""
|
||||||
|
|
||||||
code = IntegerField()
|
code = CharField()
|
||||||
component = CharField(default="ak-provider-oauth2-device-code")
|
component = CharField(default="ak-provider-oauth2-device-code")
|
||||||
|
|
||||||
def validate_code(self, code: int) -> HttpResponse | None:
|
def validate_code(self, code: int) -> HttpResponse | None:
|
||||||
|
@ -19,6 +19,7 @@ SCIM_GROUP_SCHEMA = "urn:ietf:params:scim:schemas:core:2.0:Group"
|
|||||||
class User(BaseUser):
|
class User(BaseUser):
|
||||||
"""Modified User schema with added externalId field"""
|
"""Modified User schema with added externalId field"""
|
||||||
|
|
||||||
|
id: str | int | None = None
|
||||||
schemas: list[str] = [SCIM_USER_SCHEMA]
|
schemas: list[str] = [SCIM_USER_SCHEMA]
|
||||||
externalId: str | None = None
|
externalId: str | None = None
|
||||||
meta: dict | None = None
|
meta: dict | None = None
|
||||||
@ -27,6 +28,7 @@ class User(BaseUser):
|
|||||||
class Group(BaseGroup):
|
class Group(BaseGroup):
|
||||||
"""Modified Group schema with added externalId field"""
|
"""Modified Group schema with added externalId field"""
|
||||||
|
|
||||||
|
id: str | int | None = None
|
||||||
schemas: list[str] = [SCIM_GROUP_SCHEMA]
|
schemas: list[str] = [SCIM_GROUP_SCHEMA]
|
||||||
externalId: str | None = None
|
externalId: str | None = None
|
||||||
meta: dict | None = None
|
meta: dict | None = None
|
||||||
|
@ -53,7 +53,7 @@ class ExtraRoleObjectPermissionSerializer(RoleObjectPermissionSerializer):
|
|||||||
except LookupError:
|
except LookupError:
|
||||||
return None
|
return None
|
||||||
objects = get_objects_for_group(instance.group, f"{app_label}.view_{model}", model_class)
|
objects = get_objects_for_group(instance.group, f"{app_label}.view_{model}", model_class)
|
||||||
obj = objects.first()
|
obj = objects.filter(pk=instance.object_pk).first()
|
||||||
if not obj:
|
if not obj:
|
||||||
return None
|
return None
|
||||||
return str(obj)
|
return str(obj)
|
||||||
|
@ -53,7 +53,7 @@ class ExtraUserObjectPermissionSerializer(UserObjectPermissionSerializer):
|
|||||||
except LookupError:
|
except LookupError:
|
||||||
return None
|
return None
|
||||||
objects = get_objects_for_user(instance.user, f"{app_label}.view_{model}", model_class)
|
objects = get_objects_for_user(instance.user, f"{app_label}.view_{model}", model_class)
|
||||||
obj = objects.first()
|
obj = objects.filter(pk=instance.object_pk).first()
|
||||||
if not obj:
|
if not obj:
|
||||||
return None
|
return None
|
||||||
return str(obj)
|
return str(obj)
|
||||||
|
@ -6,7 +6,6 @@ from tempfile import gettempdir
|
|||||||
from typing import Any
|
from typing import Any
|
||||||
|
|
||||||
import gssapi
|
import gssapi
|
||||||
import kadmin
|
|
||||||
import pglock
|
import pglock
|
||||||
from django.db import connection, models
|
from django.db import connection, models
|
||||||
from django.db.models.fields import b64decode
|
from django.db.models.fields import b64decode
|
||||||
@ -14,6 +13,8 @@ from django.http import HttpRequest
|
|||||||
from django.shortcuts import reverse
|
from django.shortcuts import reverse
|
||||||
from django.templatetags.static import static
|
from django.templatetags.static import static
|
||||||
from django.utils.translation import gettext_lazy as _
|
from django.utils.translation import gettext_lazy as _
|
||||||
|
from kadmin import KAdmin
|
||||||
|
from kadmin.exceptions import PyKAdminException
|
||||||
from rest_framework.serializers import Serializer
|
from rest_framework.serializers import Serializer
|
||||||
from structlog.stdlib import get_logger
|
from structlog.stdlib import get_logger
|
||||||
|
|
||||||
@ -30,9 +31,8 @@ from authentik.flows.challenge import RedirectChallenge
|
|||||||
LOGGER = get_logger()
|
LOGGER = get_logger()
|
||||||
|
|
||||||
|
|
||||||
# python-kadmin leaks file descriptors. As such, this global is used to reuse
|
# Creating kadmin connections is expensive. As such, this global is used to reuse
|
||||||
# existing kadmin connections instead of creating new ones, which results in less to no file
|
# existing kadmin connections instead of creating new ones
|
||||||
# descriptors leaks
|
|
||||||
_kadmin_connections: dict[str, Any] = {}
|
_kadmin_connections: dict[str, Any] = {}
|
||||||
|
|
||||||
|
|
||||||
@ -198,13 +198,13 @@ class KerberosSource(Source):
|
|||||||
conf_path.write_text(self.krb5_conf)
|
conf_path.write_text(self.krb5_conf)
|
||||||
return str(conf_path)
|
return str(conf_path)
|
||||||
|
|
||||||
def _kadmin_init(self) -> "kadmin.KAdmin | None":
|
def _kadmin_init(self) -> KAdmin | None:
|
||||||
# kadmin doesn't use a ccache for its connection
|
# kadmin doesn't use a ccache for its connection
|
||||||
# as such, we don't need to create a separate ccache for each source
|
# as such, we don't need to create a separate ccache for each source
|
||||||
if not self.sync_principal:
|
if not self.sync_principal:
|
||||||
return None
|
return None
|
||||||
if self.sync_password:
|
if self.sync_password:
|
||||||
return kadmin.init_with_password(
|
return KAdmin.with_password(
|
||||||
self.sync_principal,
|
self.sync_principal,
|
||||||
self.sync_password,
|
self.sync_password,
|
||||||
)
|
)
|
||||||
@ -215,18 +215,18 @@ class KerberosSource(Source):
|
|||||||
keytab_path.touch(mode=0o600)
|
keytab_path.touch(mode=0o600)
|
||||||
keytab_path.write_bytes(b64decode(self.sync_keytab))
|
keytab_path.write_bytes(b64decode(self.sync_keytab))
|
||||||
keytab = f"FILE:{keytab_path}"
|
keytab = f"FILE:{keytab_path}"
|
||||||
return kadmin.init_with_keytab(
|
return KAdmin.with_keytab(
|
||||||
self.sync_principal,
|
self.sync_principal,
|
||||||
keytab,
|
keytab,
|
||||||
)
|
)
|
||||||
if self.sync_ccache:
|
if self.sync_ccache:
|
||||||
return kadmin.init_with_ccache(
|
return KAdmin.with_ccache(
|
||||||
self.sync_principal,
|
self.sync_principal,
|
||||||
self.sync_ccache,
|
self.sync_ccache,
|
||||||
)
|
)
|
||||||
return None
|
return None
|
||||||
|
|
||||||
def connection(self) -> "kadmin.KAdmin | None":
|
def connection(self) -> KAdmin | None:
|
||||||
"""Get kadmin connection"""
|
"""Get kadmin connection"""
|
||||||
if str(self.pk) not in _kadmin_connections:
|
if str(self.pk) not in _kadmin_connections:
|
||||||
kadm = self._kadmin_init()
|
kadm = self._kadmin_init()
|
||||||
@ -246,7 +246,7 @@ class KerberosSource(Source):
|
|||||||
status["status"] = "no connection"
|
status["status"] = "no connection"
|
||||||
return status
|
return status
|
||||||
status["principal_exists"] = kadm.principal_exists(self.sync_principal)
|
status["principal_exists"] = kadm.principal_exists(self.sync_principal)
|
||||||
except kadmin.KAdminError as exc:
|
except PyKAdminException as exc:
|
||||||
status["status"] = str(exc)
|
status["status"] = str(exc)
|
||||||
return status
|
return status
|
||||||
|
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
"""authentik kerberos source signals"""
|
"""authentik kerberos source signals"""
|
||||||
|
|
||||||
import kadmin
|
|
||||||
from django.db.models.signals import post_save
|
from django.db.models.signals import post_save
|
||||||
from django.dispatch import receiver
|
from django.dispatch import receiver
|
||||||
|
from kadmin.exceptions import PyKAdminException
|
||||||
from rest_framework.serializers import ValidationError
|
from rest_framework.serializers import ValidationError
|
||||||
from structlog.stdlib import get_logger
|
from structlog.stdlib import get_logger
|
||||||
|
|
||||||
@ -48,7 +48,7 @@ def kerberos_sync_password(sender, user: User, password: str, **_):
|
|||||||
source.connection().getprinc(user_source_connection.identifier).change_password(
|
source.connection().getprinc(user_source_connection.identifier).change_password(
|
||||||
password
|
password
|
||||||
)
|
)
|
||||||
except kadmin.KAdminError as exc:
|
except PyKAdminException as exc:
|
||||||
LOGGER.warning("failed to set Kerberos password", exc=exc, source=source)
|
LOGGER.warning("failed to set Kerberos password", exc=exc, source=source)
|
||||||
Event.new(
|
Event.new(
|
||||||
EventAction.CONFIGURATION_ERROR,
|
EventAction.CONFIGURATION_ERROR,
|
||||||
|
@ -2,9 +2,9 @@
|
|||||||
|
|
||||||
from typing import Any
|
from typing import Any
|
||||||
|
|
||||||
import kadmin
|
|
||||||
from django.core.exceptions import FieldError
|
from django.core.exceptions import FieldError
|
||||||
from django.db import IntegrityError, transaction
|
from django.db import IntegrityError, transaction
|
||||||
|
from kadmin import KAdmin
|
||||||
from structlog.stdlib import BoundLogger, get_logger
|
from structlog.stdlib import BoundLogger, get_logger
|
||||||
|
|
||||||
from authentik.core.expression.exceptions import (
|
from authentik.core.expression.exceptions import (
|
||||||
@ -30,7 +30,7 @@ class KerberosSync:
|
|||||||
|
|
||||||
_source: KerberosSource
|
_source: KerberosSource
|
||||||
_logger: BoundLogger
|
_logger: BoundLogger
|
||||||
_connection: "kadmin.KAdmin"
|
_connection: KAdmin
|
||||||
mapper: SourceMapper
|
mapper: SourceMapper
|
||||||
user_manager: PropertyMappingManager
|
user_manager: PropertyMappingManager
|
||||||
group_manager: PropertyMappingManager
|
group_manager: PropertyMappingManager
|
||||||
@ -161,7 +161,7 @@ class KerberosSync:
|
|||||||
|
|
||||||
user_count = 0
|
user_count = 0
|
||||||
with Krb5ConfContext(self._source):
|
with Krb5ConfContext(self._source):
|
||||||
for principal in self._connection.principals():
|
for principal in self._connection.list_principals(None):
|
||||||
if self._handle_principal(principal):
|
if self._handle_principal(principal):
|
||||||
user_count += 1
|
user_count += 1
|
||||||
return user_count
|
return user_count
|
||||||
|
@ -23,6 +23,7 @@ class TestKerberosAuth(KerberosTestCase):
|
|||||||
)
|
)
|
||||||
self.user = User.objects.create(username=generate_id())
|
self.user = User.objects.create(username=generate_id())
|
||||||
self.user.set_unusable_password()
|
self.user.set_unusable_password()
|
||||||
|
self.user.save()
|
||||||
UserKerberosSourceConnection.objects.create(
|
UserKerberosSourceConnection.objects.create(
|
||||||
source=self.source, user=self.user, identifier=self.realm.user_princ
|
source=self.source, user=self.user, identifier=self.realm.user_princ
|
||||||
)
|
)
|
||||||
|
@ -2,6 +2,8 @@
|
|||||||
|
|
||||||
from base64 import b64decode, b64encode
|
from base64 import b64decode, b64encode
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
from sys import platform
|
||||||
|
from unittest import skipUnless
|
||||||
|
|
||||||
import gssapi
|
import gssapi
|
||||||
from django.urls import reverse
|
from django.urls import reverse
|
||||||
@ -36,6 +38,7 @@ class TestSPNEGOSource(KerberosTestCase):
|
|||||||
)
|
)
|
||||||
self.assertEqual(response.status_code, 200)
|
self.assertEqual(response.status_code, 200)
|
||||||
|
|
||||||
|
@skipUnless(platform.startswith("linux"), "Requires compatible GSSAPI implementation")
|
||||||
def test_source_login(self):
|
def test_source_login(self):
|
||||||
"""test login view"""
|
"""test login view"""
|
||||||
response = self.client.get(
|
response = self.client.get(
|
||||||
|
File diff suppressed because one or more lines are too long
@ -17,6 +17,7 @@ class CaptchaStageSerializer(StageSerializer):
|
|||||||
"private_key",
|
"private_key",
|
||||||
"js_url",
|
"js_url",
|
||||||
"api_url",
|
"api_url",
|
||||||
|
"interactive",
|
||||||
"score_min_threshold",
|
"score_min_threshold",
|
||||||
"score_max_threshold",
|
"score_max_threshold",
|
||||||
"error_on_invalid_score",
|
"error_on_invalid_score",
|
||||||
|
@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 5.0.9 on 2024-10-30 14:28
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("authentik_stages_captcha", "0003_captchastage_error_on_invalid_score_and_more"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name="captchastage",
|
||||||
|
name="interactive",
|
||||||
|
field=models.BooleanField(default=False),
|
||||||
|
),
|
||||||
|
]
|
@ -9,11 +9,13 @@ from authentik.flows.models import Stage
|
|||||||
|
|
||||||
|
|
||||||
class CaptchaStage(Stage):
|
class CaptchaStage(Stage):
|
||||||
"""Verify the user is human using Google's reCaptcha."""
|
"""Verify the user is human using Google's reCaptcha/other compatible CAPTCHA solutions."""
|
||||||
|
|
||||||
public_key = models.TextField(help_text=_("Public key, acquired your captcha Provider."))
|
public_key = models.TextField(help_text=_("Public key, acquired your captcha Provider."))
|
||||||
private_key = models.TextField(help_text=_("Private key, acquired your captcha Provider."))
|
private_key = models.TextField(help_text=_("Private key, acquired your captcha Provider."))
|
||||||
|
|
||||||
|
interactive = models.BooleanField(default=False)
|
||||||
|
|
||||||
score_min_threshold = models.FloatField(default=0.5) # Default values for reCaptcha
|
score_min_threshold = models.FloatField(default=0.5) # Default values for reCaptcha
|
||||||
score_max_threshold = models.FloatField(default=1.0) # Default values for reCaptcha
|
score_max_threshold = models.FloatField(default=1.0) # Default values for reCaptcha
|
||||||
|
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
from django.http.response import HttpResponse
|
from django.http.response import HttpResponse
|
||||||
from django.utils.translation import gettext as _
|
from django.utils.translation import gettext as _
|
||||||
from requests import RequestException
|
from requests import RequestException
|
||||||
from rest_framework.fields import CharField
|
from rest_framework.fields import BooleanField, CharField
|
||||||
from rest_framework.serializers import ValidationError
|
from rest_framework.serializers import ValidationError
|
||||||
from structlog.stdlib import get_logger
|
from structlog.stdlib import get_logger
|
||||||
|
|
||||||
@ -24,10 +24,12 @@ PLAN_CONTEXT_CAPTCHA = "captcha"
|
|||||||
class CaptchaChallenge(WithUserInfoChallenge):
|
class CaptchaChallenge(WithUserInfoChallenge):
|
||||||
"""Site public key"""
|
"""Site public key"""
|
||||||
|
|
||||||
site_key = CharField()
|
|
||||||
js_url = CharField()
|
|
||||||
component = CharField(default="ak-stage-captcha")
|
component = CharField(default="ak-stage-captcha")
|
||||||
|
|
||||||
|
site_key = CharField(required=True)
|
||||||
|
js_url = CharField(required=True)
|
||||||
|
interactive = BooleanField(required=True)
|
||||||
|
|
||||||
|
|
||||||
def verify_captcha_token(stage: CaptchaStage, token: str, remote_ip: str):
|
def verify_captcha_token(stage: CaptchaStage, token: str, remote_ip: str):
|
||||||
"""Validate captcha token"""
|
"""Validate captcha token"""
|
||||||
@ -103,6 +105,7 @@ class CaptchaStageView(ChallengeStageView):
|
|||||||
data={
|
data={
|
||||||
"js_url": self.executor.current_stage.js_url,
|
"js_url": self.executor.current_stage.js_url,
|
||||||
"site_key": self.executor.current_stage.public_key,
|
"site_key": self.executor.current_stage.public_key,
|
||||||
|
"interactive": self.executor.current_stage.interactive,
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -223,6 +223,7 @@ class IdentificationStageView(ChallengeStageView):
|
|||||||
{
|
{
|
||||||
"js_url": current_stage.captcha_stage.js_url,
|
"js_url": current_stage.captcha_stage.js_url,
|
||||||
"site_key": current_stage.captcha_stage.public_key,
|
"site_key": current_stage.captcha_stage.public_key,
|
||||||
|
"interactive": current_stage.captcha_stage.interactive,
|
||||||
}
|
}
|
||||||
if current_stage.captcha_stage
|
if current_stage.captcha_stage
|
||||||
else None
|
else None
|
||||||
|
@ -21,7 +21,7 @@ from authentik.flows.challenge import (
|
|||||||
WithUserInfoChallenge,
|
WithUserInfoChallenge,
|
||||||
)
|
)
|
||||||
from authentik.flows.exceptions import StageInvalidException
|
from authentik.flows.exceptions import StageInvalidException
|
||||||
from authentik.flows.models import Flow, FlowDesignation, Stage
|
from authentik.flows.models import Flow, Stage
|
||||||
from authentik.flows.planner import PLAN_CONTEXT_PENDING_USER
|
from authentik.flows.planner import PLAN_CONTEXT_PENDING_USER
|
||||||
from authentik.flows.stage import ChallengeStageView
|
from authentik.flows.stage import ChallengeStageView
|
||||||
from authentik.lib.utils.reflection import path_to_class
|
from authentik.lib.utils.reflection import path_to_class
|
||||||
@ -141,11 +141,11 @@ class PasswordStageView(ChallengeStageView):
|
|||||||
"allow_show_password": self.executor.current_stage.allow_show_password,
|
"allow_show_password": self.executor.current_stage.allow_show_password,
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
recovery_flow = Flow.objects.filter(designation=FlowDesignation.RECOVERY)
|
recovery_flow: Flow | None = self.request.brand.flow_recovery
|
||||||
if recovery_flow.exists():
|
if recovery_flow:
|
||||||
recover_url = reverse(
|
recover_url = reverse(
|
||||||
"authentik_core:if-flow",
|
"authentik_core:if-flow",
|
||||||
kwargs={"flow_slug": recovery_flow.first().slug},
|
kwargs={"flow_slug": recovery_flow.slug},
|
||||||
)
|
)
|
||||||
challenge.initial_data["recovery_url"] = self.request.build_absolute_uri(recover_url)
|
challenge.initial_data["recovery_url"] = self.request.build_absolute_uri(recover_url)
|
||||||
return challenge
|
return challenge
|
||||||
|
@ -5,7 +5,7 @@ from unittest.mock import MagicMock, patch
|
|||||||
from django.core.exceptions import PermissionDenied
|
from django.core.exceptions import PermissionDenied
|
||||||
from django.urls import reverse
|
from django.urls import reverse
|
||||||
|
|
||||||
from authentik.core.tests.utils import create_test_admin_user, create_test_flow
|
from authentik.core.tests.utils import create_test_admin_user, create_test_brand, create_test_flow
|
||||||
from authentik.flows.markers import StageMarker
|
from authentik.flows.markers import StageMarker
|
||||||
from authentik.flows.models import FlowDesignation, FlowStageBinding
|
from authentik.flows.models import FlowDesignation, FlowStageBinding
|
||||||
from authentik.flows.planner import PLAN_CONTEXT_PENDING_USER, FlowPlan
|
from authentik.flows.planner import PLAN_CONTEXT_PENDING_USER, FlowPlan
|
||||||
@ -57,6 +57,9 @@ class TestPasswordStage(FlowTestCase):
|
|||||||
def test_recovery_flow_link(self):
|
def test_recovery_flow_link(self):
|
||||||
"""Test link to the default recovery flow"""
|
"""Test link to the default recovery flow"""
|
||||||
flow = create_test_flow(designation=FlowDesignation.RECOVERY)
|
flow = create_test_flow(designation=FlowDesignation.RECOVERY)
|
||||||
|
brand = create_test_brand()
|
||||||
|
brand.flow_recovery = flow
|
||||||
|
brand.save()
|
||||||
|
|
||||||
plan = FlowPlan(flow_pk=self.flow.pk.hex, bindings=[self.binding], markers=[StageMarker()])
|
plan = FlowPlan(flow_pk=self.flow.pk.hex, bindings=[self.binding], markers=[StageMarker()])
|
||||||
session = self.client.session
|
session = self.client.session
|
||||||
|
@ -23,6 +23,7 @@ class SettingsSerializer(ModelSerializer):
|
|||||||
"footer_links",
|
"footer_links",
|
||||||
"gdpr_compliance",
|
"gdpr_compliance",
|
||||||
"impersonation",
|
"impersonation",
|
||||||
|
"impersonation_require_reason",
|
||||||
"default_token_duration",
|
"default_token_duration",
|
||||||
"default_token_length",
|
"default_token_length",
|
||||||
]
|
]
|
||||||
|
@ -0,0 +1,21 @@
|
|||||||
|
# Generated by Django 5.0.9 on 2024-11-07 15:08
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("authentik_tenants", "0003_alter_tenant_default_token_duration"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name="tenant",
|
||||||
|
name="impersonation_require_reason",
|
||||||
|
field=models.BooleanField(
|
||||||
|
default=True,
|
||||||
|
help_text="Require administrators to provide a reason for impersonating a user.",
|
||||||
|
),
|
||||||
|
),
|
||||||
|
]
|
@ -85,6 +85,10 @@ class Tenant(TenantMixin, SerializerModel):
|
|||||||
impersonation = models.BooleanField(
|
impersonation = models.BooleanField(
|
||||||
help_text=_("Globally enable/disable impersonation."), default=True
|
help_text=_("Globally enable/disable impersonation."), default=True
|
||||||
)
|
)
|
||||||
|
impersonation_require_reason = models.BooleanField(
|
||||||
|
help_text=_("Require administrators to provide a reason for impersonating a user."),
|
||||||
|
default=True,
|
||||||
|
)
|
||||||
default_token_duration = models.TextField(
|
default_token_duration = models.TextField(
|
||||||
help_text=_("Default token duration"),
|
help_text=_("Default token duration"),
|
||||||
default=DEFAULT_TOKEN_DURATION,
|
default=DEFAULT_TOKEN_DURATION,
|
||||||
|
@ -8,9 +8,11 @@ from authentik.root.install_id import get_install_id
|
|||||||
from authentik.tenants.models import Tenant
|
from authentik.tenants.models import Tenant
|
||||||
|
|
||||||
|
|
||||||
def get_current_tenant() -> Tenant:
|
def get_current_tenant(only: list[str] | None = None) -> Tenant:
|
||||||
"""Get tenant for current request"""
|
"""Get tenant for current request"""
|
||||||
return Tenant.objects.get(schema_name=connection.schema_name)
|
if only is None:
|
||||||
|
only = []
|
||||||
|
return Tenant.objects.only(*only).get(schema_name=connection.schema_name)
|
||||||
|
|
||||||
|
|
||||||
def get_unique_identifier() -> str:
|
def get_unique_identifier() -> str:
|
||||||
|
@ -101,7 +101,6 @@ entries:
|
|||||||
- !KeyOf prompt-field-email
|
- !KeyOf prompt-field-email
|
||||||
- !KeyOf prompt-field-password
|
- !KeyOf prompt-field-password
|
||||||
- !KeyOf prompt-field-password-repeat
|
- !KeyOf prompt-field-password-repeat
|
||||||
validation_policies: []
|
|
||||||
id: stage-default-oobe-password
|
id: stage-default-oobe-password
|
||||||
identifiers:
|
identifiers:
|
||||||
name: stage-default-oobe-password
|
name: stage-default-oobe-password
|
||||||
|
@ -2,6 +2,17 @@ version: 1
|
|||||||
metadata:
|
metadata:
|
||||||
name: Default - Password change flow
|
name: Default - Password change flow
|
||||||
entries:
|
entries:
|
||||||
|
- attrs:
|
||||||
|
check_static_rules: true
|
||||||
|
check_zxcvbn: true
|
||||||
|
length_min: 8
|
||||||
|
password_field: password
|
||||||
|
zxcvbn_score_threshold: 2
|
||||||
|
error_message: Password needs to be 8 characters or longer.
|
||||||
|
identifiers:
|
||||||
|
name: default-password-change-password-policy
|
||||||
|
model: authentik_policies_password.passwordpolicy
|
||||||
|
id: default-password-change-password-policy
|
||||||
- attrs:
|
- attrs:
|
||||||
designation: stage_configuration
|
designation: stage_configuration
|
||||||
name: Change Password
|
name: Change Password
|
||||||
@ -39,6 +50,8 @@ entries:
|
|||||||
fields:
|
fields:
|
||||||
- !KeyOf prompt-field-password
|
- !KeyOf prompt-field-password
|
||||||
- !KeyOf prompt-field-password-repeat
|
- !KeyOf prompt-field-password-repeat
|
||||||
|
validation_policies:
|
||||||
|
- !KeyOf default-password-change-password-policy
|
||||||
identifiers:
|
identifiers:
|
||||||
name: default-password-change-prompt
|
name: default-password-change-prompt
|
||||||
id: default-password-change-prompt
|
id: default-password-change-prompt
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
"$schema": "http://json-schema.org/draft-07/schema",
|
"$schema": "http://json-schema.org/draft-07/schema",
|
||||||
"$id": "https://goauthentik.io/blueprints/schema.json",
|
"$id": "https://goauthentik.io/blueprints/schema.json",
|
||||||
"type": "object",
|
"type": "object",
|
||||||
"title": "authentik 2024.8.3 Blueprint schema",
|
"title": "authentik 2024.10.2 Blueprint schema",
|
||||||
"required": [
|
"required": [
|
||||||
"version",
|
"version",
|
||||||
"entries"
|
"entries"
|
||||||
@ -6974,7 +6974,7 @@
|
|||||||
"spnego_server_name": {
|
"spnego_server_name": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"title": "Spnego server name",
|
"title": "Spnego server name",
|
||||||
"description": "Force the use of a specific server name for SPNEGO"
|
"description": "Force the use of a specific server name for SPNEGO. Must be in the form HTTP@hostname"
|
||||||
},
|
},
|
||||||
"spnego_keytab": {
|
"spnego_keytab": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
@ -9781,6 +9781,10 @@
|
|||||||
"minLength": 1,
|
"minLength": 1,
|
||||||
"title": "Api url"
|
"title": "Api url"
|
||||||
},
|
},
|
||||||
|
"interactive": {
|
||||||
|
"type": "boolean",
|
||||||
|
"title": "Interactive"
|
||||||
|
},
|
||||||
"score_min_threshold": {
|
"score_min_threshold": {
|
||||||
"type": "number",
|
"type": "number",
|
||||||
"title": "Score min threshold"
|
"title": "Score min threshold"
|
||||||
@ -13383,12 +13387,6 @@
|
|||||||
"title": "Authorization flow",
|
"title": "Authorization flow",
|
||||||
"description": "Flow used when authorizing this provider."
|
"description": "Flow used when authorizing this provider."
|
||||||
},
|
},
|
||||||
"invalidation_flow": {
|
|
||||||
"type": "string",
|
|
||||||
"format": "uuid",
|
|
||||||
"title": "Invalidation flow",
|
|
||||||
"description": "Flow used ending the session from a provider."
|
|
||||||
},
|
|
||||||
"property_mappings": {
|
"property_mappings": {
|
||||||
"type": "array",
|
"type": "array",
|
||||||
"items": {
|
"items": {
|
||||||
|
@ -38,7 +38,7 @@ entries:
|
|||||||
name: "authentik default Kerberos User Mapping: Ignore system principals"
|
name: "authentik default Kerberos User Mapping: Ignore system principals"
|
||||||
expression: |
|
expression: |
|
||||||
localpart, realm = principal.rsplit("@", 1)
|
localpart, realm = principal.rsplit("@", 1)
|
||||||
denied_prefixes = ["kadmin/", "krbtgt/", "K/M", "WELLKNOWN/"]
|
denied_prefixes = ["kadmin/", "krbtgt/", "K/M", "WELLKNOWN/", "kiprop/", "changepw/"]
|
||||||
for prefix in denied_prefixes:
|
for prefix in denied_prefixes:
|
||||||
if localpart.lower().startswith(prefix.lower()):
|
if localpart.lower().startswith(prefix.lower()):
|
||||||
raise SkipObject
|
raise SkipObject
|
||||||
|
@ -31,7 +31,7 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- redis:/data
|
- redis:/data
|
||||||
server:
|
server:
|
||||||
image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2024.8.3}
|
image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2024.10.2}
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
command: server
|
command: server
|
||||||
environment:
|
environment:
|
||||||
@ -52,7 +52,7 @@ services:
|
|||||||
- postgresql
|
- postgresql
|
||||||
- redis
|
- redis
|
||||||
worker:
|
worker:
|
||||||
image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2024.8.3}
|
image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2024.10.2}
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
command: worker
|
command: worker
|
||||||
environment:
|
environment:
|
||||||
|
6
go.mod
6
go.mod
@ -29,10 +29,10 @@ require (
|
|||||||
github.com/spf13/cobra v1.8.1
|
github.com/spf13/cobra v1.8.1
|
||||||
github.com/stretchr/testify v1.9.0
|
github.com/stretchr/testify v1.9.0
|
||||||
github.com/wwt/guac v1.3.2
|
github.com/wwt/guac v1.3.2
|
||||||
goauthentik.io/api/v3 v3.2024083.13
|
goauthentik.io/api/v3 v3.2024102.3
|
||||||
golang.org/x/exp v0.0.0-20230210204819-062eb4c674ab
|
golang.org/x/exp v0.0.0-20230210204819-062eb4c674ab
|
||||||
golang.org/x/oauth2 v0.23.0
|
golang.org/x/oauth2 v0.24.0
|
||||||
golang.org/x/sync v0.8.0
|
golang.org/x/sync v0.9.0
|
||||||
gopkg.in/yaml.v2 v2.4.0
|
gopkg.in/yaml.v2 v2.4.0
|
||||||
layeh.com/radius v0.0.0-20210819152912-ad72663a72ab
|
layeh.com/radius v0.0.0-20210819152912-ad72663a72ab
|
||||||
)
|
)
|
||||||
|
12
go.sum
12
go.sum
@ -299,8 +299,8 @@ go.opentelemetry.io/otel/trace v1.24.0 h1:CsKnnL4dUAr/0llH9FKuc698G04IrpWV0MQA/Y
|
|||||||
go.opentelemetry.io/otel/trace v1.24.0/go.mod h1:HPc3Xr/cOApsBI154IU0OI0HJexz+aw5uPdbs3UCjNU=
|
go.opentelemetry.io/otel/trace v1.24.0/go.mod h1:HPc3Xr/cOApsBI154IU0OI0HJexz+aw5uPdbs3UCjNU=
|
||||||
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
|
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
|
||||||
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
|
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
|
||||||
goauthentik.io/api/v3 v3.2024083.13 h1:xKh3feJYUeLw583zZ5ifgV0qjD37ZCOzgXPfbHQSbHM=
|
goauthentik.io/api/v3 v3.2024102.3 h1:akjkJMS7tj4Df/oRb0kylkZnRYskRhereXXbhvcvi1g=
|
||||||
goauthentik.io/api/v3 v3.2024083.13/go.mod h1:zz+mEZg8rY/7eEjkMGWJ2DnGqk+zqxuybGCGrR2O4Kw=
|
goauthentik.io/api/v3 v3.2024102.3/go.mod h1:zz+mEZg8rY/7eEjkMGWJ2DnGqk+zqxuybGCGrR2O4Kw=
|
||||||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||||
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
||||||
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
||||||
@ -388,8 +388,8 @@ golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4Iltr
|
|||||||
golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
||||||
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
||||||
golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
|
golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
|
||||||
golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs=
|
golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE=
|
||||||
golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
|
golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
|
||||||
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
@ -400,8 +400,8 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ
|
|||||||
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
|
golang.org/x/sync v0.9.0 h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ=
|
||||||
golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
|
golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
|
||||||
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||||
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||||
golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
|
@ -29,4 +29,4 @@ func UserAgent() string {
|
|||||||
return fmt.Sprintf("authentik@%s", FullVersion())
|
return fmt.Sprintf("authentik@%s", FullVersion())
|
||||||
}
|
}
|
||||||
|
|
||||||
const VERSION = "2024.8.3"
|
const VERSION = "2024.10.2"
|
||||||
|
@ -80,7 +80,7 @@ func NewAPIController(akURL url.URL, token string) *APIController {
|
|||||||
var outposts *api.PaginatedOutpostList
|
var outposts *api.PaginatedOutpostList
|
||||||
var err error
|
var err error
|
||||||
for {
|
for {
|
||||||
outposts, _, err = apiClient.OutpostsApi.OutpostsInstancesList(context.Background()).Execute()
|
outposts, _, err = apiClient.OutpostsAPI.OutpostsInstancesList(context.Background()).Execute()
|
||||||
|
|
||||||
if err == nil {
|
if err == nil {
|
||||||
break
|
break
|
||||||
@ -96,7 +96,7 @@ func NewAPIController(akURL url.URL, token string) *APIController {
|
|||||||
|
|
||||||
log.WithField("name", outpost.Name).Debug("Fetched outpost configuration")
|
log.WithField("name", outpost.Name).Debug("Fetched outpost configuration")
|
||||||
|
|
||||||
akConfig, _, err := apiClient.RootApi.RootConfigRetrieve(context.Background()).Execute()
|
akConfig, _, err := apiClient.RootAPI.RootConfigRetrieve(context.Background()).Execute()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.WithError(err).Error("Failed to fetch global configuration")
|
log.WithError(err).Error("Failed to fetch global configuration")
|
||||||
return nil
|
return nil
|
||||||
@ -174,7 +174,7 @@ func (a *APIController) Token() string {
|
|||||||
func (a *APIController) OnRefresh() error {
|
func (a *APIController) OnRefresh() error {
|
||||||
// Because we don't know the outpost UUID, we simply do a list and pick the first
|
// Because we don't know the outpost UUID, we simply do a list and pick the first
|
||||||
// The service account this token belongs to should only have access to a single outpost
|
// The service account this token belongs to should only have access to a single outpost
|
||||||
outposts, _, err := a.Client.OutpostsApi.OutpostsInstancesList(context.Background()).Execute()
|
outposts, _, err := a.Client.OutpostsAPI.OutpostsInstancesList(context.Background()).Execute()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.WithError(err).Error("Failed to fetch outpost configuration")
|
log.WithError(err).Error("Failed to fetch outpost configuration")
|
||||||
return err
|
return err
|
||||||
|
@ -9,7 +9,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
type CryptoStore struct {
|
type CryptoStore struct {
|
||||||
api *api.CryptoApiService
|
api *api.CryptoAPIService
|
||||||
|
|
||||||
log *log.Entry
|
log *log.Entry
|
||||||
|
|
||||||
@ -17,7 +17,7 @@ type CryptoStore struct {
|
|||||||
certificates map[string]*tls.Certificate
|
certificates map[string]*tls.Certificate
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewCryptoStore(cryptoApi *api.CryptoApiService) *CryptoStore {
|
func NewCryptoStore(cryptoApi *api.CryptoAPIService) *CryptoStore {
|
||||||
return &CryptoStore{
|
return &CryptoStore{
|
||||||
api: cryptoApi,
|
api: cryptoApi,
|
||||||
log: log.WithField("logger", "authentik.outpost.cryptostore"),
|
log: log.WithField("logger", "authentik.outpost.cryptostore"),
|
||||||
|
@ -139,7 +139,7 @@ func (fe *FlowExecutor) SetSession(s *http.Cookie) {
|
|||||||
func (fe *FlowExecutor) WarmUp() error {
|
func (fe *FlowExecutor) WarmUp() error {
|
||||||
gcsp := sentry.StartSpan(fe.Context, "authentik.outposts.flow_executor.get_challenge")
|
gcsp := sentry.StartSpan(fe.Context, "authentik.outposts.flow_executor.get_challenge")
|
||||||
defer gcsp.Finish()
|
defer gcsp.Finish()
|
||||||
req := fe.api.FlowsApi.FlowsExecutorGet(gcsp.Context(), fe.flowSlug).Query(fe.Params.Encode())
|
req := fe.api.FlowsAPI.FlowsExecutorGet(gcsp.Context(), fe.flowSlug).Query(fe.Params.Encode())
|
||||||
_, _, err := req.Execute()
|
_, _, err := req.Execute()
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@ -156,7 +156,7 @@ func (fe *FlowExecutor) Execute() (bool, error) {
|
|||||||
func (fe *FlowExecutor) getInitialChallenge() (*api.ChallengeTypes, error) {
|
func (fe *FlowExecutor) getInitialChallenge() (*api.ChallengeTypes, error) {
|
||||||
// Get challenge
|
// Get challenge
|
||||||
gcsp := sentry.StartSpan(fe.Context, "authentik.outposts.flow_executor.get_challenge")
|
gcsp := sentry.StartSpan(fe.Context, "authentik.outposts.flow_executor.get_challenge")
|
||||||
req := fe.api.FlowsApi.FlowsExecutorGet(gcsp.Context(), fe.flowSlug).Query(fe.Params.Encode())
|
req := fe.api.FlowsAPI.FlowsExecutorGet(gcsp.Context(), fe.flowSlug).Query(fe.Params.Encode())
|
||||||
challenge, _, err := req.Execute()
|
challenge, _, err := req.Execute()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@ -179,7 +179,7 @@ func (fe *FlowExecutor) getInitialChallenge() (*api.ChallengeTypes, error) {
|
|||||||
func (fe *FlowExecutor) solveFlowChallenge(challenge *api.ChallengeTypes, depth int) (bool, error) {
|
func (fe *FlowExecutor) solveFlowChallenge(challenge *api.ChallengeTypes, depth int) (bool, error) {
|
||||||
// Resole challenge
|
// Resole challenge
|
||||||
scsp := sentry.StartSpan(fe.Context, "authentik.outposts.flow_executor.solve_challenge")
|
scsp := sentry.StartSpan(fe.Context, "authentik.outposts.flow_executor.solve_challenge")
|
||||||
responseReq := fe.api.FlowsApi.FlowsExecutorSolve(scsp.Context(), fe.flowSlug).Query(fe.Params.Encode())
|
responseReq := fe.api.FlowsAPI.FlowsExecutorSolve(scsp.Context(), fe.flowSlug).Query(fe.Params.Encode())
|
||||||
i := challenge.GetActualInstance()
|
i := challenge.GetActualInstance()
|
||||||
if i == nil {
|
if i == nil {
|
||||||
return false, errors.New("response request instance was null")
|
return false, errors.New("response request instance was null")
|
||||||
|
@ -58,7 +58,7 @@ func (db *DirectBinder) Bind(username string, req *bind.Request) (ldap.LDAPResul
|
|||||||
return ldap.LDAPResultInvalidCredentials, nil
|
return ldap.LDAPResultInvalidCredentials, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
access, _, err := fe.ApiClient().OutpostsApi.OutpostsLdapAccessCheck(
|
access, _, err := fe.ApiClient().OutpostsAPI.OutpostsLdapAccessCheck(
|
||||||
req.Context(), db.si.GetProviderID(),
|
req.Context(), db.si.GetProviderID(),
|
||||||
).AppSlug(db.si.GetAppSlug()).Execute()
|
).AppSlug(db.si.GetAppSlug()).Execute()
|
||||||
if !access.Access.Passing {
|
if !access.Access.Passing {
|
||||||
@ -84,7 +84,7 @@ func (db *DirectBinder) Bind(username string, req *bind.Request) (ldap.LDAPResul
|
|||||||
req.Log().Info("User has access")
|
req.Log().Info("User has access")
|
||||||
uisp := sentry.StartSpan(req.Context(), "authentik.providers.ldap.bind.user_info")
|
uisp := sentry.StartSpan(req.Context(), "authentik.providers.ldap.bind.user_info")
|
||||||
// Get user info to store in context
|
// Get user info to store in context
|
||||||
userInfo, _, err := fe.ApiClient().CoreApi.CoreUsersMeRetrieve(context.Background()).Execute()
|
userInfo, _, err := fe.ApiClient().CoreAPI.CoreUsersMeRetrieve(context.Background()).Execute()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
metrics.RequestsRejected.With(prometheus.Labels{
|
metrics.RequestsRejected.With(prometheus.Labels{
|
||||||
"outpost_name": db.si.GetOutpostName(),
|
"outpost_name": db.si.GetOutpostName(),
|
||||||
|
@ -30,7 +30,7 @@ func NewServer(ac *ak.APIController) *LDAPServer {
|
|||||||
ls := &LDAPServer{
|
ls := &LDAPServer{
|
||||||
log: log.WithField("logger", "authentik.outpost.ldap"),
|
log: log.WithField("logger", "authentik.outpost.ldap"),
|
||||||
ac: ac,
|
ac: ac,
|
||||||
cs: ak.NewCryptoStore(ac.Client.CryptoApi),
|
cs: ak.NewCryptoStore(ac.Client.CryptoAPI),
|
||||||
providers: []*ProviderInstance{},
|
providers: []*ProviderInstance{},
|
||||||
}
|
}
|
||||||
s := ldap.NewServer()
|
s := ldap.NewServer()
|
||||||
@ -65,7 +65,7 @@ func (ls *LDAPServer) StartLDAPServer() error {
|
|||||||
ls.log.WithField("listen", listen).WithError(err).Warning("Failed to listen (SSL)")
|
ls.log.WithField("listen", listen).WithError(err).Warning("Failed to listen (SSL)")
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
proxyListener := &proxyproto.Listener{Listener: ln}
|
proxyListener := &proxyproto.Listener{Listener: ln, ConnPolicy: utils.GetProxyConnectionPolicy()}
|
||||||
defer proxyListener.Close()
|
defer proxyListener.Close()
|
||||||
|
|
||||||
ls.log.WithField("listen", listen).Info("Starting LDAP server")
|
ls.log.WithField("listen", listen).Info("Starting LDAP server")
|
||||||
|
@ -48,7 +48,7 @@ func (ls *LDAPServer) StartLDAPTLSServer() error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
proxyListener := &proxyproto.Listener{Listener: ln}
|
proxyListener := &proxyproto.Listener{Listener: ln, ConnPolicy: utils.GetProxyConnectionPolicy()}
|
||||||
defer proxyListener.Close()
|
defer proxyListener.Close()
|
||||||
|
|
||||||
tln := tls.NewListener(proxyListener, tlsConfig)
|
tln := tls.NewListener(proxyListener, tlsConfig)
|
||||||
|
@ -30,7 +30,7 @@ func (ls *LDAPServer) getCurrentProvider(pk int32) *ProviderInstance {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (ls *LDAPServer) Refresh() error {
|
func (ls *LDAPServer) Refresh() error {
|
||||||
apiProviders, err := ak.Paginator(ls.ac.Client.OutpostsApi.OutpostsLdapList(context.Background()), ak.PaginatorOptions{
|
apiProviders, err := ak.Paginator(ls.ac.Client.OutpostsAPI.OutpostsLdapList(context.Background()), ak.PaginatorOptions{
|
||||||
PageSize: 100,
|
PageSize: 100,
|
||||||
Logger: ls.log,
|
Logger: ls.log,
|
||||||
})
|
})
|
||||||
|
@ -113,7 +113,7 @@ func (ds *DirectSearcher) Search(req *search.Request) (ldap.ServerSearchResult,
|
|||||||
errs.Go(func() error {
|
errs.Go(func() error {
|
||||||
if flags.CanSearch {
|
if flags.CanSearch {
|
||||||
uapisp := sentry.StartSpan(errCtx, "authentik.providers.ldap.search.api_user")
|
uapisp := sentry.StartSpan(errCtx, "authentik.providers.ldap.search.api_user")
|
||||||
searchReq, skip := utils.ParseFilterForUser(c.CoreApi.CoreUsersList(uapisp.Context()).IncludeGroups(true), parsedFilter, false)
|
searchReq, skip := utils.ParseFilterForUser(c.CoreAPI.CoreUsersList(uapisp.Context()).IncludeGroups(true), parsedFilter, false)
|
||||||
|
|
||||||
if skip {
|
if skip {
|
||||||
req.Log().Trace("Skip backend request")
|
req.Log().Trace("Skip backend request")
|
||||||
@ -132,7 +132,7 @@ func (ds *DirectSearcher) Search(req *search.Request) (ldap.ServerSearchResult,
|
|||||||
} else {
|
} else {
|
||||||
if flags.UserInfo == nil {
|
if flags.UserInfo == nil {
|
||||||
uapisp := sentry.StartSpan(errCtx, "authentik.providers.ldap.search.api_user")
|
uapisp := sentry.StartSpan(errCtx, "authentik.providers.ldap.search.api_user")
|
||||||
u, _, err := c.CoreApi.CoreUsersRetrieve(uapisp.Context(), flags.UserPk).Execute()
|
u, _, err := c.CoreAPI.CoreUsersRetrieve(uapisp.Context(), flags.UserPk).Execute()
|
||||||
uapisp.Finish()
|
uapisp.Finish()
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -155,7 +155,7 @@ func (ds *DirectSearcher) Search(req *search.Request) (ldap.ServerSearchResult,
|
|||||||
if needGroups {
|
if needGroups {
|
||||||
errs.Go(func() error {
|
errs.Go(func() error {
|
||||||
gapisp := sentry.StartSpan(errCtx, "authentik.providers.ldap.search.api_group")
|
gapisp := sentry.StartSpan(errCtx, "authentik.providers.ldap.search.api_group")
|
||||||
searchReq, skip := utils.ParseFilterForGroup(c.CoreApi.CoreGroupsList(gapisp.Context()).IncludeUsers(true), parsedFilter, false)
|
searchReq, skip := utils.ParseFilterForGroup(c.CoreAPI.CoreGroupsList(gapisp.Context()).IncludeUsers(true), parsedFilter, false)
|
||||||
if skip {
|
if skip {
|
||||||
req.Log().Trace("Skip backend request")
|
req.Log().Trace("Skip backend request")
|
||||||
return nil
|
return nil
|
||||||
|
@ -39,12 +39,12 @@ func NewMemorySearcher(si server.LDAPServerInstance) *MemorySearcher {
|
|||||||
}
|
}
|
||||||
ms.log.Debug("initialised memory searcher")
|
ms.log.Debug("initialised memory searcher")
|
||||||
// Error is not handled here, we get an empty/truncated list and the error is logged
|
// Error is not handled here, we get an empty/truncated list and the error is logged
|
||||||
users, _ := ak.Paginator(ms.si.GetAPIClient().CoreApi.CoreUsersList(context.TODO()).IncludeGroups(true), ak.PaginatorOptions{
|
users, _ := ak.Paginator(ms.si.GetAPIClient().CoreAPI.CoreUsersList(context.TODO()).IncludeGroups(true), ak.PaginatorOptions{
|
||||||
PageSize: 100,
|
PageSize: 100,
|
||||||
Logger: ms.log,
|
Logger: ms.log,
|
||||||
})
|
})
|
||||||
ms.users = users
|
ms.users = users
|
||||||
groups, _ := ak.Paginator(ms.si.GetAPIClient().CoreApi.CoreGroupsList(context.TODO()).IncludeUsers(true), ak.PaginatorOptions{
|
groups, _ := ak.Paginator(ms.si.GetAPIClient().CoreAPI.CoreGroupsList(context.TODO()).IncludeUsers(true), ak.PaginatorOptions{
|
||||||
PageSize: 100,
|
PageSize: 100,
|
||||||
Logger: ms.log,
|
Logger: ms.log,
|
||||||
})
|
})
|
||||||
|
@ -23,6 +23,7 @@ import (
|
|||||||
"github.com/prometheus/client_golang/prometheus"
|
"github.com/prometheus/client_golang/prometheus"
|
||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
"goauthentik.io/api/v3"
|
"goauthentik.io/api/v3"
|
||||||
|
"goauthentik.io/internal/config"
|
||||||
"goauthentik.io/internal/outpost/ak"
|
"goauthentik.io/internal/outpost/ak"
|
||||||
"goauthentik.io/internal/outpost/proxyv2/constants"
|
"goauthentik.io/internal/outpost/proxyv2/constants"
|
||||||
"goauthentik.io/internal/outpost/proxyv2/hs256"
|
"goauthentik.io/internal/outpost/proxyv2/hs256"
|
||||||
@ -121,6 +122,14 @@ func NewApplication(p api.ProxyOutpostConfig, c *http.Client, server Server, old
|
|||||||
bs := string(h.Sum([]byte(*p.ClientId)))
|
bs := string(h.Sum([]byte(*p.ClientId)))
|
||||||
sessionName := fmt.Sprintf("authentik_proxy_%s", bs[:8])
|
sessionName := fmt.Sprintf("authentik_proxy_%s", bs[:8])
|
||||||
|
|
||||||
|
// When HOST_BROWSER is set, use that as Host header for token requests to make the issuer match
|
||||||
|
// otherwise we use the internally configured authentik_host
|
||||||
|
tokenEndpointHost := server.API().Outpost.Config["authentik_host"].(string)
|
||||||
|
if config.Get().AuthentikHostBrowser != "" {
|
||||||
|
tokenEndpointHost = config.Get().AuthentikHostBrowser
|
||||||
|
}
|
||||||
|
publicHTTPClient := web.NewHostInterceptor(c, tokenEndpointHost)
|
||||||
|
|
||||||
a := &Application{
|
a := &Application{
|
||||||
Host: externalHost.Host,
|
Host: externalHost.Host,
|
||||||
log: muxLogger,
|
log: muxLogger,
|
||||||
@ -131,7 +140,7 @@ func NewApplication(p api.ProxyOutpostConfig, c *http.Client, server Server, old
|
|||||||
tokenVerifier: verifier,
|
tokenVerifier: verifier,
|
||||||
proxyConfig: p,
|
proxyConfig: p,
|
||||||
httpClient: c,
|
httpClient: c,
|
||||||
publicHostHTTPClient: web.NewHostInterceptor(c, server.API().Outpost.Config["authentik_host"].(string)),
|
publicHostHTTPClient: publicHTTPClient,
|
||||||
mux: mux,
|
mux: mux,
|
||||||
errorTemplates: templates.GetTemplates(),
|
errorTemplates: templates.GetTemplates(),
|
||||||
ak: server.API(),
|
ak: server.API(),
|
||||||
|
@ -120,7 +120,7 @@ func (a *Application) ReportMisconfiguration(r *http.Request, msg string, fields
|
|||||||
ClientIp: *api.NewNullableString(api.PtrString(r.RemoteAddr)),
|
ClientIp: *api.NewNullableString(api.PtrString(r.RemoteAddr)),
|
||||||
Context: fields,
|
Context: fields,
|
||||||
}
|
}
|
||||||
_, _, err := a.ak.Client.EventsApi.EventsEventsCreate(context.Background()).EventRequest(req).Execute()
|
_, _, err := a.ak.Client.EventsAPI.EventsEventsCreate(context.Background()).EventRequest(req).Execute()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
a.log.WithError(err).Warning("failed to report configuration error")
|
a.log.WithError(err).Warning("failed to report configuration error")
|
||||||
}
|
}
|
||||||
|
@ -56,7 +56,7 @@ func NewProxyServer(ac *ak.APIController) *ProxyServer {
|
|||||||
globalMux.Use(sentryhttp.New(sentryhttp.Options{}).Handle)
|
globalMux.Use(sentryhttp.New(sentryhttp.Options{}).Handle)
|
||||||
}
|
}
|
||||||
s := &ProxyServer{
|
s := &ProxyServer{
|
||||||
cryptoStore: ak.NewCryptoStore(ac.Client.CryptoApi),
|
cryptoStore: ak.NewCryptoStore(ac.Client.CryptoAPI),
|
||||||
apps: make(map[string]*application.Application),
|
apps: make(map[string]*application.Application),
|
||||||
log: l,
|
log: l,
|
||||||
mux: rootMux,
|
mux: rootMux,
|
||||||
@ -129,7 +129,7 @@ func (ps *ProxyServer) ServeHTTP() {
|
|||||||
ps.log.WithField("listen", listenAddress).WithError(err).Warning("Failed to listen")
|
ps.log.WithField("listen", listenAddress).WithError(err).Warning("Failed to listen")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
proxyListener := &proxyproto.Listener{Listener: listener}
|
proxyListener := &proxyproto.Listener{Listener: listener, ConnPolicy: utils.GetProxyConnectionPolicy()}
|
||||||
defer proxyListener.Close()
|
defer proxyListener.Close()
|
||||||
|
|
||||||
ps.log.WithField("listen", listenAddress).Info("Starting HTTP server")
|
ps.log.WithField("listen", listenAddress).Info("Starting HTTP server")
|
||||||
@ -148,7 +148,7 @@ func (ps *ProxyServer) ServeHTTPS() {
|
|||||||
ps.log.WithError(err).Warning("Failed to listen (TLS)")
|
ps.log.WithError(err).Warning("Failed to listen (TLS)")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
proxyListener := &proxyproto.Listener{Listener: web.TCPKeepAliveListener{TCPListener: ln.(*net.TCPListener)}}
|
proxyListener := &proxyproto.Listener{Listener: web.TCPKeepAliveListener{TCPListener: ln.(*net.TCPListener)}, ConnPolicy: utils.GetProxyConnectionPolicy()}
|
||||||
defer proxyListener.Close()
|
defer proxyListener.Close()
|
||||||
|
|
||||||
tlsListener := tls.NewListener(proxyListener, tlsConfig)
|
tlsListener := tls.NewListener(proxyListener, tlsConfig)
|
||||||
|
@ -15,7 +15,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func (ps *ProxyServer) Refresh() error {
|
func (ps *ProxyServer) Refresh() error {
|
||||||
providers, err := ak.Paginator(ps.akAPI.Client.OutpostsApi.OutpostsProxyList(context.Background()), ak.PaginatorOptions{
|
providers, err := ak.Paginator(ps.akAPI.Client.OutpostsAPI.OutpostsProxyList(context.Background()), ak.PaginatorOptions{
|
||||||
PageSize: 100,
|
PageSize: 100,
|
||||||
Logger: ps.log,
|
Logger: ps.log,
|
||||||
})
|
})
|
||||||
|
@ -31,7 +31,7 @@ func parseCIDRs(raw string) []*net.IPNet {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (rs *RadiusServer) Refresh() error {
|
func (rs *RadiusServer) Refresh() error {
|
||||||
apiProviders, err := ak.Paginator(rs.ac.Client.OutpostsApi.OutpostsRadiusList(context.Background()), ak.PaginatorOptions{
|
apiProviders, err := ak.Paginator(rs.ac.Client.OutpostsAPI.OutpostsRadiusList(context.Background()), ak.PaginatorOptions{
|
||||||
PageSize: 100,
|
PageSize: 100,
|
||||||
Logger: rs.log,
|
Logger: rs.log,
|
||||||
})
|
})
|
||||||
|
@ -45,7 +45,7 @@ func (rs *RadiusServer) Handle_AccessRequest(w radius.ResponseWriter, r *RadiusR
|
|||||||
_ = w.Write(r.Response(radius.CodeAccessReject))
|
_ = w.Write(r.Response(radius.CodeAccessReject))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
access, _, err := fe.ApiClient().OutpostsApi.OutpostsRadiusAccessCheck(
|
access, _, err := fe.ApiClient().OutpostsAPI.OutpostsRadiusAccessCheck(
|
||||||
r.Context(), r.pi.providerId,
|
r.Context(), r.pi.providerId,
|
||||||
).AppSlug(r.pi.appSlug).Execute()
|
).AppSlug(r.pi.appSlug).Execute()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
34
internal/utils/proxy.go
Normal file
34
internal/utils/proxy.go
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
package utils
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net"
|
||||||
|
|
||||||
|
"github.com/pires/go-proxyproto"
|
||||||
|
log "github.com/sirupsen/logrus"
|
||||||
|
"goauthentik.io/internal/config"
|
||||||
|
)
|
||||||
|
|
||||||
|
func GetProxyConnectionPolicy() proxyproto.ConnPolicyFunc {
|
||||||
|
nets := []*net.IPNet{}
|
||||||
|
for _, rn := range config.Get().Listen.TrustedProxyCIDRs {
|
||||||
|
_, cidr, err := net.ParseCIDR(rn)
|
||||||
|
if err != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
nets = append(nets, cidr)
|
||||||
|
}
|
||||||
|
return func(connPolicyOptions proxyproto.ConnPolicyOptions) (proxyproto.Policy, error) {
|
||||||
|
host, _, err := net.SplitHostPort(connPolicyOptions.Upstream.String())
|
||||||
|
if err == nil {
|
||||||
|
// remoteAddr will be nil if the IP cannot be parsed
|
||||||
|
remoteAddr := net.ParseIP(host)
|
||||||
|
for _, allowedCidr := range nets {
|
||||||
|
if remoteAddr != nil && allowedCidr.Contains(remoteAddr) {
|
||||||
|
log.WithField("remoteAddr", remoteAddr).WithField("cidr", allowedCidr.String()).Trace("Using remote IP from proxy protocol")
|
||||||
|
return proxyproto.USE, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return proxyproto.SKIP, nil
|
||||||
|
}
|
||||||
|
}
|
@ -14,8 +14,10 @@ type hostInterceptor struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (t hostInterceptor) RoundTrip(r *http.Request) (*http.Response, error) {
|
func (t hostInterceptor) RoundTrip(r *http.Request) (*http.Response, error) {
|
||||||
r.Host = t.host
|
if r.Host != t.host {
|
||||||
r.Header.Set("X-Forwarded-Proto", t.scheme)
|
r.Host = t.host
|
||||||
|
r.Header.Set("X-Forwarded-Proto", t.scheme)
|
||||||
|
}
|
||||||
return t.inner.RoundTrip(r)
|
return t.inner.RoundTrip(r)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -22,7 +22,7 @@ type Watcher struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func NewWatcher(client *api.APIClient) *Watcher {
|
func NewWatcher(client *api.APIClient) *Watcher {
|
||||||
cs := ak.NewCryptoStore(client.CryptoApi)
|
cs := ak.NewCryptoStore(client.CryptoAPI)
|
||||||
l := log.WithField("logger", "authentik.router.brand_tls")
|
l := log.WithField("logger", "authentik.router.brand_tls")
|
||||||
cert, err := crypto.GenerateSelfSignedCert()
|
cert, err := crypto.GenerateSelfSignedCert()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -47,7 +47,7 @@ func (w *Watcher) Start() {
|
|||||||
|
|
||||||
func (w *Watcher) Check() {
|
func (w *Watcher) Check() {
|
||||||
w.log.Info("updating brand certificates")
|
w.log.Info("updating brand certificates")
|
||||||
brands, err := ak.Paginator(w.client.CoreApi.CoreBrandsList(context.Background()), ak.PaginatorOptions{
|
brands, err := ak.Paginator(w.client.CoreAPI.CoreBrandsList(context.Background()), ak.PaginatorOptions{
|
||||||
PageSize: 100,
|
PageSize: 100,
|
||||||
Logger: w.log,
|
Logger: w.log,
|
||||||
})
|
})
|
||||||
|
@ -19,6 +19,7 @@ import (
|
|||||||
"goauthentik.io/internal/config"
|
"goauthentik.io/internal/config"
|
||||||
"goauthentik.io/internal/gounicorn"
|
"goauthentik.io/internal/gounicorn"
|
||||||
"goauthentik.io/internal/outpost/proxyv2"
|
"goauthentik.io/internal/outpost/proxyv2"
|
||||||
|
"goauthentik.io/internal/utils"
|
||||||
"goauthentik.io/internal/utils/web"
|
"goauthentik.io/internal/utils/web"
|
||||||
"goauthentik.io/internal/web/brand_tls"
|
"goauthentik.io/internal/web/brand_tls"
|
||||||
)
|
)
|
||||||
@ -149,7 +150,7 @@ func (ws *WebServer) listenPlain() {
|
|||||||
ws.log.WithError(err).Warning("failed to listen")
|
ws.log.WithError(err).Warning("failed to listen")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
proxyListener := &proxyproto.Listener{Listener: ln}
|
proxyListener := &proxyproto.Listener{Listener: ln, ConnPolicy: utils.GetProxyConnectionPolicy()}
|
||||||
defer proxyListener.Close()
|
defer proxyListener.Close()
|
||||||
|
|
||||||
ws.log.WithField("listen", config.Get().Listen.HTTP).Info("Starting HTTP server")
|
ws.log.WithField("listen", config.Get().Listen.HTTP).Info("Starting HTTP server")
|
||||||
|
@ -45,7 +45,7 @@ func (ws *WebServer) listenTLS() {
|
|||||||
ws.log.WithError(err).Warning("failed to listen (TLS)")
|
ws.log.WithError(err).Warning("failed to listen (TLS)")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
proxyListener := &proxyproto.Listener{Listener: web.TCPKeepAliveListener{TCPListener: ln.(*net.TCPListener)}}
|
proxyListener := &proxyproto.Listener{Listener: web.TCPKeepAliveListener{TCPListener: ln.(*net.TCPListener)}, ConnPolicy: utils.GetProxyConnectionPolicy()}
|
||||||
defer proxyListener.Close()
|
defer proxyListener.Close()
|
||||||
|
|
||||||
tlsListener := tls.NewListener(proxyListener, tlsConfig)
|
tlsListener := tls.NewListener(proxyListener, tlsConfig)
|
@ -33,6 +33,7 @@ RUN --mount=type=cache,sharing=locked,target=/go/pkg/mod \
|
|||||||
# Stage 2: Run
|
# Stage 2: Run
|
||||||
FROM ghcr.io/goauthentik/fips-debian:bookworm-slim-fips
|
FROM ghcr.io/goauthentik/fips-debian:bookworm-slim-fips
|
||||||
|
|
||||||
|
ARG VERSION
|
||||||
ARG GIT_BUILD_HASH
|
ARG GIT_BUILD_HASH
|
||||||
ENV GIT_BUILD_HASH=$GIT_BUILD_HASH
|
ENV GIT_BUILD_HASH=$GIT_BUILD_HASH
|
||||||
|
|
||||||
|
@ -54,7 +54,9 @@ function cleanup {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function prepare_debug {
|
function prepare_debug {
|
||||||
apt-get install -y --no-install-recommends krb5-kdc krb5-user krb5-admin-server
|
export DEBIAN_FRONTEND=noninteractive
|
||||||
|
apt-get update
|
||||||
|
apt-get install -y --no-install-recommends krb5-kdc krb5-user krb5-admin-server libkrb5-dev gcc
|
||||||
VIRTUAL_ENV=/ak-root/venv poetry install --no-ansi --no-interaction
|
VIRTUAL_ENV=/ak-root/venv poetry install --no-ansi --no-interaction
|
||||||
touch /unittest.xml
|
touch /unittest.xml
|
||||||
chown authentik:authentik /unittest.xml
|
chown authentik:authentik /unittest.xml
|
||||||
|
@ -1,15 +1,17 @@
|
|||||||
"""Wrapper for lifecycle/ak, to be installed by poetry"""
|
"""Wrapper for lifecycle/ak, to be installed by poetry"""
|
||||||
|
|
||||||
from os import system
|
from os import system, waitstatus_to_exitcode
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from sys import argv
|
from sys import argv, exit
|
||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
"""Wrapper around ak bash script"""
|
"""Wrapper around ak bash script"""
|
||||||
current_path = Path(__file__)
|
current_path = Path(__file__)
|
||||||
args = " ".join(argv[1:])
|
args = " ".join(argv[1:])
|
||||||
system(f"{current_path.parent}/ak {args}") # nosec
|
res = system(f"{current_path.parent}/ak {args}") # nosec
|
||||||
|
exit_code = waitstatus_to_exitcode(res)
|
||||||
|
exit(exit_code)
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
|
Binary file not shown.
File diff suppressed because it is too large
Load Diff
@ -8,7 +8,7 @@ msgid ""
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: PACKAGE VERSION\n"
|
"Project-Id-Version: PACKAGE VERSION\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2024-10-23 16:39+0000\n"
|
"POT-Creation-Date: 2024-11-18 00:09+0000\n"
|
||||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||||
@ -101,12 +101,21 @@ msgstr ""
|
|||||||
msgid "Brands"
|
msgid "Brands"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
#: authentik/core/api/devices.py
|
||||||
|
msgid "Extra description not available"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: authentik/core/api/providers.py
|
#: authentik/core/api/providers.py
|
||||||
msgid ""
|
msgid ""
|
||||||
"When not set all providers are returned. When set to true, only backchannel "
|
"When not set all providers are returned. When set to true, only backchannel "
|
||||||
"providers are returned. When set to false, backchannel providers are excluded"
|
"providers are returned. When set to false, backchannel providers are excluded"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
#: authentik/core/api/transactional_applications.py
|
||||||
|
#, python-brace-format
|
||||||
|
msgid "User lacks permission to create {model}"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: authentik/core/api/users.py
|
#: authentik/core/api/users.py
|
||||||
msgid "No leading or trailing slashes allowed."
|
msgid "No leading or trailing slashes allowed."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
@ -1126,6 +1135,10 @@ msgstr ""
|
|||||||
msgid "Password not set in context"
|
msgid "Password not set in context"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
#: authentik/policies/password/models.py
|
||||||
|
msgid "Invalid password."
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: authentik/policies/password/models.py
|
#: authentik/policies/password/models.py
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Password exists on %(count)d online lists."
|
msgid "Password exists on %(count)d online lists."
|
||||||
@ -2614,12 +2627,7 @@ msgid "Captcha Stages"
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: authentik/stages/captcha/stage.py
|
#: authentik/stages/captcha/stage.py
|
||||||
msgid "Unknown error"
|
msgid "Invalid captcha response. Retrying may solve this issue."
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#: authentik/stages/captcha/stage.py
|
|
||||||
#, python-brace-format
|
|
||||||
msgid "Failed to validate token: {error}"
|
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: authentik/stages/captcha/stage.py
|
#: authentik/stages/captcha/stage.py
|
||||||
@ -3206,6 +3214,10 @@ msgstr ""
|
|||||||
msgid "Globally enable/disable impersonation."
|
msgid "Globally enable/disable impersonation."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
#: authentik/tenants/models.py
|
||||||
|
msgid "Require administrators to provide a reason for impersonating a user."
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: authentik/tenants/models.py
|
#: authentik/tenants/models.py
|
||||||
msgid "Default token duration"
|
msgid "Default token duration"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
Binary file not shown.
Binary file not shown.
@ -11,15 +11,17 @@
|
|||||||
# Marco Vitale, 2024
|
# Marco Vitale, 2024
|
||||||
# Kowalski Dragon (kowalski7cc) <kowalski.7cc@gmail.com>, 2024
|
# Kowalski Dragon (kowalski7cc) <kowalski.7cc@gmail.com>, 2024
|
||||||
# albanobattistella <albanobattistella@gmail.com>, 2024
|
# albanobattistella <albanobattistella@gmail.com>, 2024
|
||||||
|
# Nicola Mersi, 2024
|
||||||
|
# tom max, 2024
|
||||||
#
|
#
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid ""
|
msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: PACKAGE VERSION\n"
|
"Project-Id-Version: PACKAGE VERSION\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2024-10-18 00:09+0000\n"
|
"POT-Creation-Date: 2024-10-28 00:09+0000\n"
|
||||||
"PO-Revision-Date: 2022-09-26 16:47+0000\n"
|
"PO-Revision-Date: 2022-09-26 16:47+0000\n"
|
||||||
"Last-Translator: albanobattistella <albanobattistella@gmail.com>, 2024\n"
|
"Last-Translator: tom max, 2024\n"
|
||||||
"Language-Team: Italian (https://app.transifex.com/authentik/teams/119923/it/)\n"
|
"Language-Team: Italian (https://app.transifex.com/authentik/teams/119923/it/)\n"
|
||||||
"MIME-Version: 1.0\n"
|
"MIME-Version: 1.0\n"
|
||||||
"Content-Type: text/plain; charset=UTF-8\n"
|
"Content-Type: text/plain; charset=UTF-8\n"
|
||||||
@ -583,6 +585,28 @@ msgstr "Limite massimo di connessioni raggiunto."
|
|||||||
msgid "(You are already connected in another tab/window)"
|
msgid "(You are already connected in another tab/window)"
|
||||||
msgstr "(Sei già connesso in un'altra scheda/finestra)"
|
msgstr "(Sei già connesso in un'altra scheda/finestra)"
|
||||||
|
|
||||||
|
#: authentik/enterprise/stages/authenticator_endpoint_gdtc/models.py
|
||||||
|
msgid "Endpoint Authenticator Google Device Trust Connector Stage"
|
||||||
|
msgstr ""
|
||||||
|
"Fase di autenticazione per la verifica dispositivo Google tramite endpoint"
|
||||||
|
|
||||||
|
#: authentik/enterprise/stages/authenticator_endpoint_gdtc/models.py
|
||||||
|
msgid "Endpoint Authenticator Google Device Trust Connector Stages"
|
||||||
|
msgstr ""
|
||||||
|
"Fasi di autenticazione per la verifica dispositivo Google tramite endpoint"
|
||||||
|
|
||||||
|
#: authentik/enterprise/stages/authenticator_endpoint_gdtc/models.py
|
||||||
|
msgid "Endpoint Device"
|
||||||
|
msgstr "Dispositivo di Accesso"
|
||||||
|
|
||||||
|
#: authentik/enterprise/stages/authenticator_endpoint_gdtc/models.py
|
||||||
|
msgid "Endpoint Devices"
|
||||||
|
msgstr "Dispositivi di Accesso"
|
||||||
|
|
||||||
|
#: authentik/enterprise/stages/authenticator_endpoint_gdtc/stage.py
|
||||||
|
msgid "Verifying your browser..."
|
||||||
|
msgstr "Verifica del tuo browser..."
|
||||||
|
|
||||||
#: authentik/enterprise/stages/source/models.py
|
#: authentik/enterprise/stages/source/models.py
|
||||||
msgid ""
|
msgid ""
|
||||||
"Amount of time a user can take to return from the source to continue the "
|
"Amount of time a user can take to return from the source to continue the "
|
||||||
@ -2017,6 +2041,124 @@ msgstr ""
|
|||||||
msgid "Used recovery-link to authenticate."
|
msgid "Used recovery-link to authenticate."
|
||||||
msgstr "Utilizzato il link di recupero per autenticarsi."
|
msgstr "Utilizzato il link di recupero per autenticarsi."
|
||||||
|
|
||||||
|
#: authentik/sources/kerberos/models.py
|
||||||
|
msgid "Kerberos realm"
|
||||||
|
msgstr "Dominio Kerberos"
|
||||||
|
|
||||||
|
#: authentik/sources/kerberos/models.py
|
||||||
|
msgid "Custom krb5.conf to use. Uses the system one by default"
|
||||||
|
msgstr ""
|
||||||
|
"krb5.conf personalizzato da usare. Usa la configurazione di sistema per "
|
||||||
|
"default"
|
||||||
|
|
||||||
|
#: authentik/sources/kerberos/models.py
|
||||||
|
msgid "Sync users from Kerberos into authentik"
|
||||||
|
msgstr "Sincronizza utenti da Kerberos a authentik"
|
||||||
|
|
||||||
|
#: authentik/sources/kerberos/models.py
|
||||||
|
msgid "When a user changes their password, sync it back to Kerberos"
|
||||||
|
msgstr "Quando un utente cambia la sua password, sincronizzala in Kerberos"
|
||||||
|
|
||||||
|
#: authentik/sources/kerberos/models.py
|
||||||
|
msgid "Principal to authenticate to kadmin for sync."
|
||||||
|
msgstr "Entità da autenticare su kadmin per la sincronizzazione."
|
||||||
|
|
||||||
|
#: authentik/sources/kerberos/models.py
|
||||||
|
msgid "Password to authenticate to kadmin for sync"
|
||||||
|
msgstr "Password per autenticarsi in kadmin per sincronizzare"
|
||||||
|
|
||||||
|
#: authentik/sources/kerberos/models.py
|
||||||
|
msgid ""
|
||||||
|
"Keytab to authenticate to kadmin for sync. Must be base64-encoded or in the "
|
||||||
|
"form TYPE:residual"
|
||||||
|
msgstr ""
|
||||||
|
"Keytab per autenticarsi su kadmin per la sincronizzazione. Deve essere con "
|
||||||
|
"codifica base64 o nel formato TYPE:residual"
|
||||||
|
|
||||||
|
#: authentik/sources/kerberos/models.py
|
||||||
|
msgid ""
|
||||||
|
"Credentials cache to authenticate to kadmin for sync. Must be in the form "
|
||||||
|
"TYPE:residual"
|
||||||
|
msgstr ""
|
||||||
|
"Credenziali memorizzate nella cache per autenticarsi su kadmin per la "
|
||||||
|
"sincronizzazione. Devono essere nel formato TYPE:residual"
|
||||||
|
|
||||||
|
#: authentik/sources/kerberos/models.py
|
||||||
|
msgid ""
|
||||||
|
"Force the use of a specific server name for SPNEGO. Must be in the form "
|
||||||
|
"HTTP@hostname"
|
||||||
|
msgstr ""
|
||||||
|
"Forza l'uso di un nome server specifico per SPNEGO. Deve essere nel formato "
|
||||||
|
"HTTP@nomehost"
|
||||||
|
|
||||||
|
#: authentik/sources/kerberos/models.py
|
||||||
|
msgid "SPNEGO keytab base64-encoded or path to keytab in the form FILE:path"
|
||||||
|
msgstr ""
|
||||||
|
"keytab SPNEGO con codifica base64 o percorso del keytab nel formato "
|
||||||
|
"FILE:percorso"
|
||||||
|
|
||||||
|
#: authentik/sources/kerberos/models.py
|
||||||
|
msgid "Credential cache to use for SPNEGO in form type:residual"
|
||||||
|
msgstr ""
|
||||||
|
"Cache delle credenziali da utilizzare per SPNEGO nella forma type:residual"
|
||||||
|
|
||||||
|
#: authentik/sources/kerberos/models.py
|
||||||
|
msgid ""
|
||||||
|
"If enabled, the authentik-stored password will be updated upon login with "
|
||||||
|
"the Kerberos password backend"
|
||||||
|
msgstr ""
|
||||||
|
"Se abilitato, la password memorizzata in authentik verrà aggiornata al login"
|
||||||
|
" nel backend Kerberos"
|
||||||
|
|
||||||
|
#: authentik/sources/kerberos/models.py
|
||||||
|
msgid "Kerberos Source"
|
||||||
|
msgstr "Sorgente Kerberos"
|
||||||
|
|
||||||
|
#: authentik/sources/kerberos/models.py
|
||||||
|
msgid "Kerberos Sources"
|
||||||
|
msgstr "Sorgenti Kerberos"
|
||||||
|
|
||||||
|
#: authentik/sources/kerberos/models.py
|
||||||
|
msgid "Kerberos Source Property Mapping"
|
||||||
|
msgstr "Mappa delle proprietà della sorgente kerberos"
|
||||||
|
|
||||||
|
#: authentik/sources/kerberos/models.py
|
||||||
|
msgid "Kerberos Source Property Mappings"
|
||||||
|
msgstr "Mappe delle proprietà della sorgente kerberos"
|
||||||
|
|
||||||
|
#: authentik/sources/kerberos/models.py
|
||||||
|
msgid "User Kerberos Source Connection"
|
||||||
|
msgstr "Connessione sorgente dell'utente kerberos"
|
||||||
|
|
||||||
|
#: authentik/sources/kerberos/models.py
|
||||||
|
msgid "User Kerberos Source Connections"
|
||||||
|
msgstr " Connessioni alle sorgente dell'utente kerberos"
|
||||||
|
|
||||||
|
#: authentik/sources/kerberos/models.py
|
||||||
|
msgid "Group Kerberos Source Connection"
|
||||||
|
msgstr " Connessione sorgente del gruppo kerberos"
|
||||||
|
|
||||||
|
#: authentik/sources/kerberos/models.py
|
||||||
|
msgid "Group Kerberos Source Connections"
|
||||||
|
msgstr "Connessioni alle sorgenti del gruppo kerberos"
|
||||||
|
|
||||||
|
#: authentik/sources/kerberos/views.py
|
||||||
|
msgid "SPNEGO authentication required"
|
||||||
|
msgstr "autenticazione SPNEGO necessaria"
|
||||||
|
|
||||||
|
#: authentik/sources/kerberos/views.py
|
||||||
|
msgid ""
|
||||||
|
"\n"
|
||||||
|
" Make sure you have valid tickets (obtainable via kinit)\n"
|
||||||
|
" and configured the browser correctly.\n"
|
||||||
|
" Please contact your administrator.\n"
|
||||||
|
" "
|
||||||
|
msgstr ""
|
||||||
|
"\n"
|
||||||
|
"Assicurati di avere un ticket valido (ottenibile tramite kinit)\n"
|
||||||
|
" e di aver configurato correttamente il browser. \n"
|
||||||
|
"Contatta il tuo amministratore."
|
||||||
|
|
||||||
#: authentik/sources/ldap/api.py
|
#: authentik/sources/ldap/api.py
|
||||||
msgid "Only a single LDAP Source with password synchronization is allowed"
|
msgid "Only a single LDAP Source with password synchronization is allowed"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
@ -2735,13 +2877,10 @@ msgid "Captcha Stages"
|
|||||||
msgstr "Fasi Captcha"
|
msgstr "Fasi Captcha"
|
||||||
|
|
||||||
#: authentik/stages/captcha/stage.py
|
#: authentik/stages/captcha/stage.py
|
||||||
msgid "Unknown error"
|
msgid "Invalid captcha response. Retrying may solve this issue."
|
||||||
msgstr "Errore sconosciuto"
|
msgstr ""
|
||||||
|
"Risposta captcha non valida. Un nuovo tentativo potrebbe risolvere il "
|
||||||
#: authentik/stages/captcha/stage.py
|
"problema."
|
||||||
#, python-brace-format
|
|
||||||
msgid "Failed to validate token: {error}"
|
|
||||||
msgstr "Impossibile convalidare il token: {error}"
|
|
||||||
|
|
||||||
#: authentik/stages/captcha/stage.py
|
#: authentik/stages/captcha/stage.py
|
||||||
msgid "Invalid captcha response"
|
msgid "Invalid captcha response"
|
||||||
@ -3114,6 +3253,10 @@ msgstr "Database utente + password app"
|
|||||||
msgid "User database + LDAP password"
|
msgid "User database + LDAP password"
|
||||||
msgstr "Database utenti + password LDAP"
|
msgstr "Database utenti + password LDAP"
|
||||||
|
|
||||||
|
#: authentik/stages/password/models.py
|
||||||
|
msgid "User database + Kerberos password"
|
||||||
|
msgstr "Database utenti + password Kerberos"
|
||||||
|
|
||||||
#: authentik/stages/password/models.py
|
#: authentik/stages/password/models.py
|
||||||
msgid "Selection of backends to test the password against."
|
msgid "Selection of backends to test the password against."
|
||||||
msgstr "Selezione di backend su cui testare la password."
|
msgstr "Selezione di backend su cui testare la password."
|
||||||
|
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
@ -15,7 +15,7 @@ msgid ""
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: PACKAGE VERSION\n"
|
"Project-Id-Version: PACKAGE VERSION\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2024-10-23 16:39+0000\n"
|
"POT-Creation-Date: 2024-11-18 00:09+0000\n"
|
||||||
"PO-Revision-Date: 2022-09-26 16:47+0000\n"
|
"PO-Revision-Date: 2022-09-26 16:47+0000\n"
|
||||||
"Last-Translator: deluxghost, 2024\n"
|
"Last-Translator: deluxghost, 2024\n"
|
||||||
"Language-Team: Chinese Simplified (https://app.transifex.com/authentik/teams/119923/zh-Hans/)\n"
|
"Language-Team: Chinese Simplified (https://app.transifex.com/authentik/teams/119923/zh-Hans/)\n"
|
||||||
@ -110,6 +110,10 @@ msgstr "品牌"
|
|||||||
msgid "Brands"
|
msgid "Brands"
|
||||||
msgstr "品牌"
|
msgstr "品牌"
|
||||||
|
|
||||||
|
#: authentik/core/api/devices.py
|
||||||
|
msgid "Extra description not available"
|
||||||
|
msgstr "额外描述不可用"
|
||||||
|
|
||||||
#: authentik/core/api/providers.py
|
#: authentik/core/api/providers.py
|
||||||
msgid ""
|
msgid ""
|
||||||
"When not set all providers are returned. When set to true, only backchannel "
|
"When not set all providers are returned. When set to true, only backchannel "
|
||||||
@ -117,6 +121,11 @@ msgid ""
|
|||||||
"excluded"
|
"excluded"
|
||||||
msgstr "如果未设置,则返回所有提供程序。如果启用,仅返回反向通道提供程序。如果禁用,则返回非反向通道提供程序"
|
msgstr "如果未设置,则返回所有提供程序。如果启用,仅返回反向通道提供程序。如果禁用,则返回非反向通道提供程序"
|
||||||
|
|
||||||
|
#: authentik/core/api/transactional_applications.py
|
||||||
|
#, python-brace-format
|
||||||
|
msgid "User lacks permission to create {model}"
|
||||||
|
msgstr "用户缺少创建 {model} 的权限"
|
||||||
|
|
||||||
#: authentik/core/api/users.py
|
#: authentik/core/api/users.py
|
||||||
msgid "No leading or trailing slashes allowed."
|
msgid "No leading or trailing slashes allowed."
|
||||||
msgstr "不允许以斜线开始或结尾。"
|
msgstr "不允许以斜线开始或结尾。"
|
||||||
@ -1140,6 +1149,10 @@ msgstr "如果 zxcvbn 分数小于等于此值,则策略失败。"
|
|||||||
msgid "Password not set in context"
|
msgid "Password not set in context"
|
||||||
msgstr "未在上下文中设置密码"
|
msgstr "未在上下文中设置密码"
|
||||||
|
|
||||||
|
#: authentik/policies/password/models.py
|
||||||
|
msgid "Invalid password."
|
||||||
|
msgstr "无效密码。"
|
||||||
|
|
||||||
#: authentik/policies/password/models.py
|
#: authentik/policies/password/models.py
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Password exists on %(count)d online lists."
|
msgid "Password exists on %(count)d online lists."
|
||||||
@ -2649,13 +2662,8 @@ msgid "Captcha Stages"
|
|||||||
msgstr "验证码阶段"
|
msgstr "验证码阶段"
|
||||||
|
|
||||||
#: authentik/stages/captcha/stage.py
|
#: authentik/stages/captcha/stage.py
|
||||||
msgid "Unknown error"
|
msgid "Invalid captcha response. Retrying may solve this issue."
|
||||||
msgstr "未知错误"
|
msgstr "无效的验证码响应。重试可能会解决此问题。"
|
||||||
|
|
||||||
#: authentik/stages/captcha/stage.py
|
|
||||||
#, python-brace-format
|
|
||||||
msgid "Failed to validate token: {error}"
|
|
||||||
msgstr "验证令牌失败:{error}"
|
|
||||||
|
|
||||||
#: authentik/stages/captcha/stage.py
|
#: authentik/stages/captcha/stage.py
|
||||||
msgid "Invalid captcha response"
|
msgid "Invalid captcha response"
|
||||||
@ -3261,6 +3269,10 @@ msgstr "启用时,所有由用户造成的事件会在相应用户被删除时
|
|||||||
msgid "Globally enable/disable impersonation."
|
msgid "Globally enable/disable impersonation."
|
||||||
msgstr "全局启用/禁用模拟身份。"
|
msgstr "全局启用/禁用模拟身份。"
|
||||||
|
|
||||||
|
#: authentik/tenants/models.py
|
||||||
|
msgid "Require administrators to provide a reason for impersonating a user."
|
||||||
|
msgstr "需要管理员提供模拟用户的原因。"
|
||||||
|
|
||||||
#: authentik/tenants/models.py
|
#: authentik/tenants/models.py
|
||||||
msgid "Default token duration"
|
msgid "Default token duration"
|
||||||
msgstr "默认令牌持续时间"
|
msgstr "默认令牌持续时间"
|
||||||
|
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user