Skip to content

Commit

Permalink
core: minor fixis
Browse files Browse the repository at this point in the history
  • Loading branch information
@devopstales
devopstales committed Jun 5, 2023
1 parent 32c92b9 commit fd1d13c
Show file tree
Hide file tree
Showing 4 changed files with 71 additions and 41 deletions.
93 changes: 63 additions & 30 deletions src/kubedash/functions/registry.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
from functions.components import db
from functions.helper_functions import get_logger, ErrorHandler, find_values_in_json
from flask_login import UserMixin
from sqlalchemy import inspect

##############################################################
## Helper Functions
Expand Down Expand Up @@ -64,10 +65,10 @@ def registry_request(registry_server_url, url_path, header="application/vnd.oci.

def get_image_sbom_vulns(registry_server_url, image, tag):
vulnerabilities = None
rd, links = registry_request(registry_server_url, image+'/manifests/'+tag)
rd, links = registry_request(registry_server_url, f"{image}/manifests/{tag}")
if rd.status_code == 200:
digest = rd.json()["layers"][0]['digest']
rb, links = registry_request(registry_server_url, image+'/blobs/'+digest)
rb, links = registry_request(registry_server_url, f"{image}/blobs/{digest}")
jb = rb.json()
sbom_vulnerabilities = jb["scanner"]["result"]["Results"][0]["Vulnerabilities"]
if sbom_vulnerabilities:
Expand Down Expand Up @@ -103,7 +104,7 @@ def RegistryGetRepositories(registry_server_url):

def RegistryGetTags(registry_server_url, image):
registry_base_url = get_base_url(registry_server_url)
r, links = registry_request(registry_server_url, image + '/tags/list')
r, links = registry_request(registry_server_url, f"{image}/tags/list")
j = r.json()
tags = {
'registry': registry_base_url,
Expand All @@ -114,7 +115,7 @@ def RegistryGetTags(registry_server_url, image):

def RegistryGetManifest(registry_server_url, image, tag):
registry_base_url = get_base_url(registry_server_url)
r, links = registry_request(registry_server_url, image + '/manifests/' + tag)
r, links = registry_request(registry_server_url, f"{image}/manifests/{tag}")
j = r.json()
#print(json.dumps(j, indent=2))

Expand All @@ -126,7 +127,7 @@ def RegistryGetManifest(registry_server_url, image, tag):
created_label = None
manifest['signed'] = False

rh, links = registry_request(registry_server_url, image+'/manifests/'+tag, "application/vnd.docker.distribution.manifest.v2+json")
rh, links = registry_request(registry_server_url, f"{image}/manifests/{tag}", "application/vnd.docker.distribution.manifest.v2+json")
if 'Docker-Content-Digest' in rh.headers:
image_digest = rh.headers['Docker-Content-Digest']
image_tags = RegistryGetTags(registry_server_url, image)
Expand Down Expand Up @@ -226,7 +227,7 @@ def RegistryGetManifest(registry_server_url, image, tag):
# Helm Chart
if media_type == "application/vnd.cncf.helm.config.v1+json":
digest = j["config"]["digest"]
r2, links = registry_request(registry_server_url, image+'/blobs/'+digest)
r2, links = registry_request(registry_server_url, f"{image}/blobs/{digest}")
j2 = r2.json()
if "name" in j2:
manifest["helm_name"] = j2["name"]
Expand All @@ -252,15 +253,15 @@ def RegistryGetManifest(registry_server_url, image, tag):
if created_label:
manifest["created"] = created_label

print(json.dumps(manifest, indent=2))
#print(json.dumps(manifest, indent=2))
return manifest

##############################################################
## Database Models
##############################################################
class Registry(UserMixin, db.Model):
__tablename__ = 'registry'
id = db.Column(db.Integer, primary_key=True)
id = db.Column(db.Integer, unique=True, primary_key=True)
registry_server_url = db.Column(db.Text, unique=True, nullable=False)
registry_server_port = db.Column(db.Text, nullable=False)
registry_server_auth = db.Column(db.Boolean, nullable=False)
Expand All @@ -278,6 +279,27 @@ def __repr__(self):
"registry_server_auth_token": self.registry_server_auth_token,
}
return str(return_data)

class RegistryEvents(UserMixin, db.Model):
__tablename__ = 'registry_events'
id = db.Column(db.Integer, unique=True, primary_key=True)
action = db.Column(db.String(4), unique=False, nullable=False)
repository = db.Column(db.String(100), unique=False, nullable=False)
tag = db.Column(db.String(100), unique=False, nullable=False)
ip = db.Column(db.String(15), unique=False, nullable=False)
user = db.Column(db.String(50), unique=False, nullable=False)
created = db.Column(db.DateTime, unique=False, nullable=False)

def __repr__(self):
return_data = {
"action": self.action,
"repository": self.repository,
"tag": self.tag,
"ip": self.ip,
"user": self.user,
"created": self.created,
}
return str(return_data)

##############################################################
## Registry Server
Expand All @@ -297,7 +319,7 @@ def RegistryServerCreate(registry_server_url, registry_server_port, registry_ser
)
if registry_server_auth:
usrPass = registry_server_auth_user + ":" + registry_server_auth_pass
registry.registry_server_auth_token = base64.b64encode(usrPass)
registry.registry_server_auth_token = base64.b64encode(usrPass).decode('utf8')
db.session.add(registry)
db.session.commit()

Expand All @@ -313,7 +335,7 @@ def RegistryServerUpdate(registry_server_url, registry_server_url_old, registry_
registry.insecure_tls = insecure_tls
if registry_server_auth:
usrPass = registry_server_auth_user + ":" + registry_server_auth_pass
registry.registry_server_auth_token = base64.b64encode(usrPass)
registry.registry_server_auth_token = base64.b64encode(usrPass).decode('utf8')
db.session.commit()

def RegistryServerListGet():
Expand All @@ -336,23 +358,34 @@ def RegistryServerDelete(registry_server_url):
db.session.delete(registry)
db.session.commit()




# https://python.plainenglish.io/build-your-own-docker-registry-ui-with-pythons-flask-e06a8f51c541
# https://github.com/brennerm/docker-registry-frontend/blob/93fe4bec031534938f362f1dccfb876806efeb69/docker_registry_frontend/registry.py#L170
# ui:
## https://github.com/betonr/repo-d
## https://github.com/Quiq/docker-registry-ui
# tagmap
# https://github.com/arkii/docker-registry-ui

# https://github.com/distribution/distribution/issues/1566#issuecomment-224999363
def RegistryDeleteTag(registry_server_url, repo, tag):
try:
response, links = registry_request(registry_server_url, f"{repo}/manifests/{tag}", "DELETE")
if response.status_code != 200:
ErrorHandler(logger, "Not Supported", response.json()["errors"][0]["message"])
except urllib.error.HTTPError as e:
ErrorHandler(logger, "Not Supported", e.message)

def RegistryDeleteTag(registry_server_url, image, tag):
rd, links = registry_request(registry_server_url, f"{image}/manifests/{tag}")
if rd.status_code == 200:
digest = rd.json()["layers"][0]['digest']
try:
response, links = registry_request(registry_server_url, f"{image}/manifests/{digest}", "DELETE")
if response.status_code != 200:
ErrorHandler(logger, "Not Supported", response.json()["errors"][0]["message"])
except urllib.error.HTTPError as e:
ErrorHandler(logger, "Not Supported", e.message)
else:
ErrorHandler(logger, "Not Supported", rd.reason)

# https://stackoverflow.com/questions/71576754/delete-tags-from-a-private-docker-registry
# https://stackoverflow.com/questions/40770594/upload-a-container-to-registry-v2-using-api-2-5-1
# https://docs.docker.com/registry/spec/api/#pushing-a-layer

def RegistryEventCreate(evet_action, evet_repository,
evet_tag, evet_ip, evet_user, evet_created):
inspector = inspect(db.engine)
if inspector.has_table("registry_events"):
registry_event = RegistryEvents(
action = evet_action,
repository = evet_repository,
tag = evet_tag,
ip = evet_ip,
user = evet_user,
created = evet_created,
)
db.session.add(registry_event)
db.session.commit()
3 changes: 0 additions & 3 deletions src/kubedash/functions/routes.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1865,7 +1865,6 @@ def image_list():
session['registry_server_url'] = request.form.get('registry_server_url')

image_list = RegistryGetRepositories(session['registry_server_url'])
# print(image_list) # DEBUG

return render_template(
'registry-image-list.html.j2',
Expand All @@ -1883,7 +1882,6 @@ def image_tags():
session['image_name'] = request.form.get('image_name')

tag_list = RegistryGetTags(session['registry_server_url'], session['image_name'])
print(tag_list) # DEBUG

return render_template(
'registry-image-tag-list.html.j2',
Expand Down Expand Up @@ -1911,7 +1909,6 @@ def image_data():
session['tag_name'] = request.form.get('tag_name')

tag_data = RegistryGetManifest(session['registry_server_url'], session['image_name'], session['tag_name'])
#print(tag_data) # DEBUG

return render_template(
'registry-image-tag-data.html.j2',
Expand Down
12 changes: 6 additions & 6 deletions src/kubedash/templates/pod-data.html.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,9 +198,9 @@
{% elif c.ready == "ImagePullBackOff" %}
<td><span class="badge badge-danger">{{ c.ready }}</span></td>
{% elif c.ready == "PodInitializing"%}
<td><span class="badge badge-secondary">{{ c.ready }}</span></td>
<td><span class="badge badge-info">{{ c.ready }}</span></td>
{% else %}
<td>{{ c.ready }}</td>
<td><span class="badge badge-secondary">{{ c.ready }}</span></td>
{% endif %}
<td>{{ c.name }}</td>
<td>{{ c.image }}</td>
Expand Down Expand Up @@ -250,9 +250,9 @@
{% elif v.severity == "MEDIUM" %}
<td><span class="badge badge-primary">{{ v.severity }}</span></td>
{% elif v.severity == "LOW" %}
<td><span class="badge badge-secondary">{{ v.severity }}</span></td>
<td><span class="badge badge-info">{{ v.severity }}</span></td>
{% else %}
<td>{{ v.severity }}</td>
<td><span class="badge badge-secondary">{{ v.severity }}</span></td>
{% endif %}
<td>{{ v.score }}</td>
<td>{{ v.resource }}</td>
Expand Down Expand Up @@ -297,9 +297,9 @@
{% elif v.severity == "MEDIUM" %}
<td><span class="badge badge-primary">{{ v.severity }}</span></td>
{% elif v.severity == "LOW" %}
<td><span class="badge badge-secondary">{{ v.severity }}</span></td>
<td><span class="badge badge-info">{{ v.severity }}</span></td>
{% else %}
<td>{{ v.severity }}</td>
<td><span class="badge badge-secondary">{{ v.severity }}</span></td>
{% endif %}
<td>{{ v.score }}</td>
<td>{{ v.resource }}</td>
Expand Down
4 changes: 2 additions & 2 deletions src/kubedash/templates/registry-image-tag-data.html.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -342,9 +342,9 @@
{% elif v.severity == "MEDIUM" %}
<td><span class="badge badge-primary">{{ v.severity }}</span></td>
{% elif v.severity == "LOW" %}
<td><span class="badge badge-secondary">{{ v.severity }}</span></td>
<td><span class="badge badge-info">{{ v.severity }}</span></td>
{% else %}
<td>{{ v.severity }}</td>
<td><span class="badge badge-secondary">{{ v.severity }}</span></td>
{% endif %}
<td>{{ v.score }}</td>
<td>{{ v.resource }}</td>
Expand Down

0 comments on commit fd1d13c

Please sign in to comment.