Commit a0e51a76 authored by Sophie Herold's avatar Sophie Herold 🌼

Minor fixes

- Fix and simplify _session_id
- Fix user password change not working
parent 3aa43d91
#!/bin/bash -e
log=/tmp/carnivora-dev-deploy.log
log=/tmp/carnivora-dev-deploy_`date +%F_%T`.log
yamsql=/tmp/yamsql-out
setup=../examples/setup.yml
db=postgresql://postgres@/carnivora
......
......@@ -56,6 +56,8 @@ INSERT INTO dns.service (backend_status, domain, registered, service, service_en
SELECT "user".ins_login('user-1', 'FOMgwkMXmS');
SELECT 'user login', 'user-1', 'FOMgwkMXmS';
SELECT "user".upd_user('FOMgwkMXmS');
-- EMAIL
SELECT email.ins_mailbox('have', 'fun.example', 'myPassword');
......
......@@ -48,7 +48,7 @@ domains:
-
name: invalid_port
description: Only allow port values
check: VALUE >= 0 AND VALUE <= 65535
check: VALUE BETWEEN 0 AND 65535
-
name: t_password
type: varchar(250)
......
......@@ -5,4 +5,4 @@ checks:
-
name: ttl range
description: Ensure that TTL is at least one minute and put maximum to 48h
check: VALUE >= 60 AND VALUE <= 172800
check: VALUE BETWEEN 60 AND EXTRACT(EPOCH FROM INTERVAL '2 days')
......@@ -74,7 +74,7 @@ RETURN QUERY
SELECT
t.registered,
COALESCE(s.domain_prefix || t.domain, t.domain)::varchar,
COALESCE(s.domain_prefix || t.domain, t.domain)::dns.t_domain,
s.type,
s.rdata,
s.ttl,
......
......@@ -7,11 +7,6 @@ description: |
Not sure if this stays unique with distributed infrastructure!
returns: varchar
security_definer: false
owner: system
---
RETURN
pg_backend_pid() || '.' ||
COALESCE((SELECT backend_start FROM pg_stat_get_activity(pg_backend_pid()))::varchar, 'xxx') || '.' ||
pg_conf_load_time();
RETURN pg_backend_pid()::varchar;
......@@ -2,6 +2,9 @@
name: upd_user
description: change user passwd
templates:
- user.userlogin
returns: void
parameters:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment