mirror of
https://github.com/openziti/zrok.git
synced 2025-06-24 11:41:25 +02:00
This commit is contained in:
parent
8610cf944a
commit
9db6aa1c07
@ -7,10 +7,11 @@ import (
|
||||
|
||||
type Frontend struct {
|
||||
Model
|
||||
EnvironmentId int
|
||||
EnvironmentId *int
|
||||
Token string
|
||||
ZId string
|
||||
PublicName *string
|
||||
UrlTemplate *string
|
||||
Reserved bool
|
||||
}
|
||||
|
||||
|
@ -40,7 +40,7 @@ func TestPublicFrontend(t *testing.T) {
|
||||
fe, err := str.GetFrontend(feId, tx)
|
||||
assert.Nil(t, err)
|
||||
assert.NotNil(t, fe)
|
||||
assert.Equal(t, envId, fe.EnvironmentId)
|
||||
assert.Equal(t, envId, *fe.EnvironmentId)
|
||||
assert.Equal(t, feName, *fe.PublicName)
|
||||
|
||||
fe0, err := str.FindFrontendPubliclyNamed(feName, tx)
|
||||
|
@ -2,9 +2,10 @@
|
||||
|
||||
create table frontends (
|
||||
id serial primary key,
|
||||
environment_id integer not null references environments(id),
|
||||
environment_id integer references environments(id),
|
||||
token varchar(32) not null unique,
|
||||
z_id varchar(32) not null,
|
||||
url_template varchar(1024),
|
||||
public_name varchar(64) unique,
|
||||
reserved boolean not null default(false),
|
||||
created_at timestamptz not null default(current_timestamp),
|
||||
|
@ -19,7 +19,7 @@ drop table environments_old;
|
||||
|
||||
create table frontends (
|
||||
id integer primary key,
|
||||
environment_id integer not null references environments(id),
|
||||
environment_id integer references environments(id),
|
||||
token varchar(32) not null unique,
|
||||
z_id varchar(32) not null,
|
||||
public_name varchar(64) unique,
|
||||
|
@ -59,7 +59,7 @@ func (h *unaccessHandler) Handle(params service.UnaccessParams, principal *rest_
|
||||
return service.NewUnaccessInternalServerError()
|
||||
}
|
||||
|
||||
if sfe == nil || sfe.EnvironmentId != senv.Id {
|
||||
if sfe == nil || (sfe.EnvironmentId != nil && *sfe.EnvironmentId != senv.Id) {
|
||||
logrus.Errorf("frontend named '%v' not found", feToken)
|
||||
return service.NewUnaccessInternalServerError()
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user