Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: security issue #21 #986

Merged
merged 2 commits into from
Aug 28, 2023
Merged

Fix: security issue #21 #986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b32bd0
Fix: security issue #21
aopoltorzhicky Aug 28, 2023
17c0ee7
Remove security scan from actions
aopoltorzhicky Aug 28, 2023
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
18 changes: 0 additions & 18 deletions .github/workflows/tests_master.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,21 +41,3 @@ jobs:
run: |
go mod download
go test ./...
security:
name: CodeQL security analyzer
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write
steps:
- name: Checkout repository
uses: actions/checkout@v2
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: 'go'
- name: Autobuild
uses: github/codeql-action/autobuild@v2
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
18 changes: 0 additions & 18 deletions .github/workflows/tests_pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,22 +40,4 @@ jobs:
run: |
go mod download
go test ./...
security:
name: CodeQL security analyzer
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write
steps:
- name: Checkout repository
uses: actions/checkout@v2
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: 'go'
- name: Autobuild
uses: github/codeql-action/autobuild@v2
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
118 changes: 54 additions & 64 deletions internal/postgres/domains/storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ package domains

import (
"errors"
"html/template"
"strings"

"github.com/baking-bad/bcdhub/internal/models/bigmapdiff"
"github.com/baking-bad/bcdhub/internal/models/contract"
Expand Down Expand Up @@ -44,29 +42,6 @@ func (storage *Storage) BigMapDiffs(lastID, size int64) (result []domains.BigMap
return
}

var sameTemplate = template.Must(
template.New("same").Parse(
`select * from (
select * from (
{{- range $index, $network := .Networks }}
{{- if (gt $index 0) }}
union all
{{- end}}
select '{{ $network }}' as network, contracts.*, accounts.address as account__address from {{ $network }}.contracts
join {{ $network }}.accounts on contracts.account_id = accounts.id
left join {{$network}}.scripts as alpha on alpha.id = contracts.alpha_id
left join {{$network}}.scripts as babylon on babylon.id = contracts.babylon_id
left join {{$network}}.scripts as jakarta on jakarta.id = contracts.jakarta_id
where (alpha.hash = '{{$.Hash}}' or babylon.hash = '{{$.Hash}}' or jakarta.hash = '{{$.Hash}}')
{{end}}
) as q
where NOT (network = '{{.network}}' and id = {{.ID}})
) as same
limit {{.limit}}
offset {{.offset}}`,
),
)

// Same -
func (storage *Storage) Same(network string, c contract.Contract, limit, offset int, availiableNetworks ...string) ([]domains.Same, error) {
if limit < 1 || limit > 10 {
Expand All @@ -86,62 +61,77 @@ func (storage *Storage) Same(network string, c contract.Contract, limit, offset
return nil, errors.New("invalid contract script")
}

data := map[string]any{
"ID": c.ID,
"Hash": script.Hash,
"limit": limit,
"offset": offset,
"network": network,
"Networks": availiableNetworks,
}
var union *pg.Query
for i, value := range availiableNetworks {
schema := pg.Safe(value)

query := storage.DB.Model().
TableExpr("?.contracts", schema).
ColumnExpr("? as network", value).
ColumnExpr("contracts.*").
ColumnExpr("accounts.address as account__address").
Join("LEFT JOIN ?.accounts on contracts.account_id = accounts.id", schema).
Join("LEFT JOIN ?.scripts as alpha on alpha.id = contracts.alpha_id", schema).
Join("LEFT JOIN ?.scripts as babylon on babylon.id = contracts.babylon_id", schema).
Join("LEFT JOIN ?.scripts as jakarta on jakarta.id = contracts.jakarta_id", schema).
Where("alpha.hash = ?", script.Hash).
WhereOr("babylon.hash = ?", script.Hash).
WhereOr("jakarta.hash = ?", script.Hash)

if value == network {
query.Where("contracts.id != ?", c.ID)
}

var buffer strings.Builder
if err := sameTemplate.Execute(&buffer, data); err != nil {
return nil, err
if i == 0 {
union = query
} else {
union = union.UnionAll(query)
}
}

var same []domains.Same
_, err := storage.DB.Query(&same, buffer.String())
err := storage.DB.Model().
TableExpr("(?) as same", union).
Limit(limit).
Offset(offset).
Select(&same)
return same, err
}

var sameCountTemplate = template.Must(
template.New("sameCount").Parse(
`select sum(c) from (
{{- range $index, $network := .Networks }}
{{- if (gt $index 0) }}
union all
{{- end}}
select count(*) as c from {{$network}}.contracts
left join {{$network}}.scripts as alpha on alpha.id = contracts.alpha_id
left join {{$network}}.scripts as babylon on babylon.id = contracts.babylon_id
left join {{$network}}.scripts as jakarta on jakarta.id = contracts.jakarta_id
where (alpha.hash = '{{$.Hash}}' or babylon.hash = '{{$.Hash}}' or jakarta.hash = '{{$.Hash}}')
{{end}}
) as same`,
),
)

// SameCount -
func (storage *Storage) SameCount(c contract.Contract, availiableNetworks ...string) (int, error) {
if len(availiableNetworks) == 0 {
return 0, nil
}

script := c.CurrentScript()
if script == nil {
return 0, errors.New("invalid contract script")
}

data := map[string]any{
"ID": c.ID,
"Hash": script.Hash,
"Networks": availiableNetworks,
}

var buffer strings.Builder
if err := sameCountTemplate.Execute(&buffer, data); err != nil {
return 0, err
var union *pg.Query
for i, value := range availiableNetworks {
schema := pg.Safe(value)

query := storage.DB.Model().
TableExpr("?.contracts", schema).
ColumnExpr("count(*) as c").
Join("LEFT JOIN ?.scripts as alpha on alpha.id = contracts.alpha_id", schema).
Join("LEFT JOIN ?.scripts as babylon on babylon.id = contracts.babylon_id", schema).
Join("LEFT JOIN ?.scripts as jakarta on jakarta.id = contracts.jakarta_id", schema).
Where("alpha.hash = ?", script.Hash).
WhereOr("babylon.hash = ?", script.Hash).
WhereOr("jakarta.hash = ?", script.Hash)

if i == 0 {
union = query
} else {
union = union.UnionAll(query)
}
}

var count int
if _, err := storage.DB.QueryOne(pg.Scan(&count), buffer.String()); err != nil {
if err := storage.DB.Model().ColumnExpr("sum(c)").TableExpr("(?) as same", union).Select(&count); err != nil {
if errors.Is(err, pg.ErrNoRows) {
return 0, nil
}
Expand Down
Loading