Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
id
auth
Commits
e1eb24cc
Commit
e1eb24cc
authored
Nov 06, 2020
by
ale
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Close all transaction-bound sql Statements
parent
f1f7d6be
Pipeline
#8370
passed with stages
in 1 minute and 49 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
7 deletions
+15
-7
backend/sql/sql.go
backend/sql/sql.go
+15
-7
No files found.
backend/sql/sql.go
View file @
e1eb24cc
...
...
@@ -124,7 +124,9 @@ func (b *sqlServiceBackend) GetUser(ctx context.Context, name string) (*backend.
// Use NullStrings for optional fields.
var
nullableTOTP
,
nullableShard
sql
.
NullString
row
:=
tx
.
Stmt
(
b
.
stmts
[
sqlQueryGetUser
])
.
QueryRow
(
name
)
stmt
:=
tx
.
Stmt
(
b
.
stmts
[
sqlQueryGetUser
])
defer
stmt
.
Close
()
row
:=
stmt
.
QueryRow
(
name
)
if
err
:=
row
.
Scan
(
&
user
.
Email
,
&
user
.
EncryptedPassword
,
&
nullableTOTP
,
&
nullableShard
);
err
!=
nil
{
return
nil
,
false
}
...
...
@@ -150,11 +152,13 @@ func (b *sqlServiceBackend) GetUser(ctx context.Context, name string) (*backend.
}
func
(
b
*
sqlServiceBackend
)
getUserU2FRegistrations
(
tx
*
sql
.
Tx
,
name
string
)
([]
u2f
.
Registration
,
error
)
{
stmt
,
ok
:=
b
.
stmts
[
sqlQueryGetU2F
]
stmt
Tpl
,
ok
:=
b
.
stmts
[
sqlQueryGetU2F
]
if
!
ok
{
return
nil
,
nil
}
rows
,
err
:=
tx
.
Stmt
(
stmt
)
.
Query
(
name
)
stmt
:=
tx
.
Stmt
(
stmtTpl
)
defer
stmt
.
Close
()
rows
,
err
:=
stmt
.
Query
(
name
)
if
err
!=
nil
{
return
nil
,
err
}
...
...
@@ -179,11 +183,13 @@ func (b *sqlServiceBackend) getUserU2FRegistrations(tx *sql.Tx, name string) ([]
}
func
(
b
*
sqlServiceBackend
)
getUserASPs
(
tx
*
sql
.
Tx
,
name
string
)
([]
*
backend
.
AppSpecificPassword
,
error
)
{
stmt
,
ok
:=
b
.
stmts
[
sqlQueryGetASP
]
stmt
Tpl
,
ok
:=
b
.
stmts
[
sqlQueryGetASP
]
if
!
ok
{
return
nil
,
nil
}
rows
,
err
:=
tx
.
Stmt
(
stmt
)
.
Query
(
name
)
stmt
:=
tx
.
Stmt
(
stmtTpl
)
defer
stmt
.
Close
()
rows
,
err
:=
stmt
.
Query
(
name
)
if
err
!=
nil
{
return
nil
,
err
}
...
...
@@ -201,11 +207,13 @@ func (b *sqlServiceBackend) getUserASPs(tx *sql.Tx, name string) ([]*backend.App
}
func
(
b
*
sqlServiceBackend
)
getUserGroups
(
tx
*
sql
.
Tx
,
name
string
)
([]
string
,
error
)
{
stmt
,
ok
:=
b
.
stmts
[
sqlQueryGetGroups
]
stmt
Tpl
,
ok
:=
b
.
stmts
[
sqlQueryGetGroups
]
if
!
ok
{
return
nil
,
nil
}
rows
,
err
:=
tx
.
Stmt
(
stmt
)
.
Query
(
name
)
stmt
:=
tx
.
Stmt
(
stmtTpl
)
defer
stmt
.
Close
()
rows
,
err
:=
stmt
.
Query
(
name
)
if
err
!=
nil
{
return
nil
,
err
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment