Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Matrix
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Model registry
Operate
Environments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TeDomum
Matrix
Commits
5447a763
Unverified
Commit
5447a763
authored
3 years ago
by
Richard van der Hoff
Committed by
GitHub
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Remove redundant, unmaintained `convert_server_keys` script. (#10055)
parent
fe5dad46
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
changelog.d/10055.misc
+1
-0
1 addition, 0 deletions
changelog.d/10055.misc
scripts-dev/convert_server_keys.py
+0
-108
0 additions, 108 deletions
scripts-dev/convert_server_keys.py
with
1 addition
and
108 deletions
changelog.d/10055.misc
0 → 100644
+
1
−
0
View file @
5447a763
Remove redundant, unmaintained `convert_server_keys` script.
This diff is collapsed.
Click to expand it.
scripts-dev/convert_server_keys.py
deleted
100644 → 0
+
0
−
108
View file @
fe5dad46
import
json
import
sys
import
time
import
psycopg2
import
yaml
from
canonicaljson
import
encode_canonical_json
from
signedjson.key
import
read_signing_keys
from
signedjson.sign
import
sign_json
from
unpaddedbase64
import
encode_base64
db_binary_type
=
memoryview
def
select_v1_keys
(
connection
):
cursor
=
connection
.
cursor
()
cursor
.
execute
(
"
SELECT server_name, key_id, verify_key FROM server_signature_keys
"
)
rows
=
cursor
.
fetchall
()
cursor
.
close
()
results
=
{}
for
server_name
,
key_id
,
verify_key
in
rows
:
results
.
setdefault
(
server_name
,
{})[
key_id
]
=
encode_base64
(
verify_key
)
return
results
def
select_v1_certs
(
connection
):
cursor
=
connection
.
cursor
()
cursor
.
execute
(
"
SELECT server_name, tls_certificate FROM server_tls_certificates
"
)
rows
=
cursor
.
fetchall
()
cursor
.
close
()
results
=
{}
for
server_name
,
tls_certificate
in
rows
:
results
[
server_name
]
=
tls_certificate
return
results
def
select_v2_json
(
connection
):
cursor
=
connection
.
cursor
()
cursor
.
execute
(
"
SELECT server_name, key_id, key_json FROM server_keys_json
"
)
rows
=
cursor
.
fetchall
()
cursor
.
close
()
results
=
{}
for
server_name
,
key_id
,
key_json
in
rows
:
results
.
setdefault
(
server_name
,
{})[
key_id
]
=
json
.
loads
(
str
(
key_json
).
decode
(
"
utf-8
"
)
)
return
results
def
convert_v1_to_v2
(
server_name
,
valid_until
,
keys
,
certificate
):
return
{
"
old_verify_keys
"
:
{},
"
server_name
"
:
server_name
,
"
verify_keys
"
:
{
key_id
:
{
"
key
"
:
key
}
for
key_id
,
key
in
keys
.
items
()},
"
valid_until_ts
"
:
valid_until
,
}
def
rows_v2
(
server
,
json
):
valid_until
=
json
[
"
valid_until_ts
"
]
key_json
=
encode_canonical_json
(
json
)
for
key_id
in
json
[
"
verify_keys
"
]:
yield
(
server
,
key_id
,
"
-
"
,
valid_until
,
valid_until
,
db_binary_type
(
key_json
))
def
main
():
config
=
yaml
.
safe_load
(
open
(
sys
.
argv
[
1
]))
valid_until
=
int
(
time
.
time
()
/
(
3600
*
24
))
*
1000
*
3600
*
24
server_name
=
config
[
"
server_name
"
]
signing_key
=
read_signing_keys
(
open
(
config
[
"
signing_key_path
"
]))[
0
]
database
=
config
[
"
database
"
]
assert
database
[
"
name
"
]
==
"
psycopg2
"
,
"
Can only convert for postgresql
"
args
=
database
[
"
args
"
]
args
.
pop
(
"
cp_max
"
)
args
.
pop
(
"
cp_min
"
)
connection
=
psycopg2
.
connect
(
**
args
)
keys
=
select_v1_keys
(
connection
)
certificates
=
select_v1_certs
(
connection
)
json
=
select_v2_json
(
connection
)
result
=
{}
for
server
in
keys
:
if
server
not
in
json
:
v2_json
=
convert_v1_to_v2
(
server
,
valid_until
,
keys
[
server
],
certificates
[
server
]
)
v2_json
=
sign_json
(
v2_json
,
server_name
,
signing_key
)
result
[
server
]
=
v2_json
yaml
.
safe_dump
(
result
,
sys
.
stdout
,
default_flow_style
=
False
)
rows
=
[
row
for
server
,
json
in
result
.
items
()
for
row
in
rows_v2
(
server
,
json
)]
cursor
=
connection
.
cursor
()
cursor
.
executemany
(
"
INSERT INTO server_keys_json (
"
"
server_name, key_id, from_server,
"
"
ts_added_ms, ts_valid_until_ms, key_json
"
"
) VALUES (%s, %s, %s, %s, %s, %s)
"
,
rows
,
)
connection
.
commit
()
if
__name__
==
"
__main__
"
:
main
()
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment