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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions auth_jwt/models/auth_jwt_validator.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ class AuthJwtValidator(models.Model):
cookie_secure = fields.Boolean(
default=True, help="Set to false only for development without https."
)
cookie_secret = fields.Char()

_sql_constraints = [
("name_uniq", "unique(name)", "JWT validator names must be unique !"),
Expand Down Expand Up @@ -292,10 +293,12 @@ def unlink(self):
return super().unlink()

def _get_jwt_cookie_secret(self):
secret = self.env["ir.config_parameter"].sudo().get_param("database.secret")
secret = self.cookie_secret
if not secret:
_logger.error("database.secret system parameter is not set.")
raise ConfigurationError()
secret = self.env["ir.config_parameter"].sudo().get_param("database.secret")
if not secret:
_logger.error("database.secret system parameter is not set.")
raise ConfigurationError()
return secret

@api.model
Expand Down
14 changes: 14 additions & 0 deletions auth_jwt/tests/test_auth_jwt.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

from ..exceptions import (
AmbiguousJwtValidator,
ConfigurationError,
JwtValidatorNotFound,
UnauthorizedCompositeJwtError,
UnauthorizedInvalidToken,
Expand Down Expand Up @@ -399,3 +400,16 @@ def test_public_or_jwt_valid_token(self):
with self._mock_request(authorization=authorization) as request:
self.env["ir.http"]._auth_method_public_or_jwt_validator()
assert request.jwt_payload["aud"] == "me"

def test_jwt_cookie_secret(self):
validator = self._create_validator("validator")
database_secret = self.env["ir.config_parameter"].get_param("database.secret")
self.assertEqual(database_secret, validator._get_jwt_cookie_secret())
database_secret_param = self.env["ir.config_parameter"].search(
[("key", "=", "database.secret")]
)
database_secret_param.write({"value": ""})
with self.assertRaises(ConfigurationError):
validator._get_jwt_cookie_secret()
validator.cookie_secret = "cookie-secret"
self.assertEqual(validator.cookie_secret, validator._get_jwt_cookie_secret())
4 changes: 4 additions & 0 deletions auth_jwt/views/auth_jwt_validator_views.xml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,10 @@
name="cookie_max_age"
attrs="{'invisible': [('cookie_enabled', '=', False)]}"
/>
<field
name="cookie_secret"
attrs="{'invisible': [('cookie_enabled', '=', False)]}"
/>
</group>
</group>
</sheet>
Expand Down