ereuse/devicehub-django
8
0
Fork 0
Code Issues 6 Pull requests 6 Packages Projects Releases Wiki Activity

Compare commits

base: ereuse:main
Branches Tags
ereuse:main
ereuse:upload_legacy_snapshot
ereuse:feature/states
ereuse:feature/f31-device-enviromental-impact
ereuse:fix/109-small-refactors-public-website
ereuse:issue_30
ereuse:feature/translation
ereuse:issue_19
..
compare: ereuse:feature/translation
Branches Tags
ereuse:upload_legacy_snapshot
ereuse:feature/states
ereuse:feature/f31-device-enviromental-impact
ereuse:main
ereuse:fix/109-small-refactors-public-website
ereuse:issue_30
ereuse:feature/translation
ereuse:issue_19

20 commits
main ... feature/tr

Author SHA1 Message Date
Thomas Nahuel Rusiecki 7aa7e82efc updated translations 2024-11-28 03:46:16 -03:00
Thomas Nahuel Rusiecki c806318c63 added localization for lot views 2024-11-28 03:33:41 -03:00
Thomas Nahuel Rusiecki d29ee817fa updated translations 2024-11-28 03:18:25 -03:00
Thomas Nahuel Rusiecki a2210bad20 minor typo fixed 2024-11-28 03:16:08 -03:00
Thomas Nahuel Rusiecki e425ed94c6 Update sidebar menu item names for clarity and localization 2024-11-28 02:50:57 -03:00
Thomas Nahuel Rusiecki 3f1edce1da password reset changed styling 2024-11-28 02:19:03 -03:00
Thomas Nahuel Rusiecki a2e29edee0 password reset minor improvements 2024-11-28 02:13:40 -03:00
Thomas Nahuel Rusiecki f5fba13f2b login screen minor improvements 2024-11-28 02:13:24 -03:00
Thomas Nahuel Rusiecki 7f0826c774 login error message on incorrect credentials 2024-11-28 02:13:09 -03:00
Thomas Nahuel Rusiecki 978036ef52 added bootstrap to users list 2024-11-28 00:13:05 -03:00
Thomas Nahuel Rusiecki 138848de5f device list now uses bootstrap 2024-11-27 23:58:23 -03:00
Thomas Nahuel Rusiecki 2a6396b185 improved localization 2024-11-27 02:05:57 -03:00
Thomas Nahuel Rusiecki 6c6e86cc73 localization for sign in view 2024-11-27 02:05:29 -03:00
Thomas Nahuel Rusiecki 3d362ced40 updated translations 2024-11-27 02:04:30 -03:00
Thomas Nahuel Rusiecki dc46bef55f initial spanish translations 2024-11-26 17:59:45 -03:00
Thomas Nahuel Rusiecki c4ba831262 initial catala ml translated added 2024-11-26 17:53:05 -03:00
Thomas Nahuel Rusiecki 521c082635 fixed language dropdown button 2024-11-26 17:52:41 -03:00
Thomas Nahuel Rusiecki 37caeeb6be localization config and url 2024-11-26 17:52:27 -03:00
Thomas Nahuel Rusiecki 963f56e74b added localization dependency in case needed 2024-11-26 17:52:03 -03:00
Thomas Nahuel Rusiecki 9db1f2dc9b added custom tag and dropdown button at footer 2024-11-26 17:11:40 -03:00
70 changed files with 2203 additions and 2316 deletions
Show stats Expand all files Collapse all files

3
.env.example
View file

@ -2,8 +2,7 @@ DOMAIN=localhost
DEMO=true
# note that with DEBUG=true, logs are more verbose (include tracebacks)
DEBUG=true
ALLOWED_HOSTS=${DOMAIN},${DOMAIN}:8000,127.0.0.1,127.0.0.1:8000
DPP=false
ALLOWED_HOSTS=localhost,localhost:8000,127.0.0.1,
STATIC_ROOT=/tmp/static/
MEDIA_ROOT=/tmp/media/

36
admin/templates/admin_users.html
View file

@ -2,35 +2,37 @@
{% load i18n %}
{% block content %}
<div class="row">
<div class="row mb-4">
<div class="col">
<h3>{{ subtitle }}</h3>
</div>
<div class="col-2">
<a href="{% url 'admin:new_user' %}" class="btn btn-green-admin">{% translate "Add new user" %}</a>
<div class="col-2 text-end">
<a href="{% url 'admin:new_user' %}" class="btn btn-green-admin "><i class="bi bi-person-plus"></i> {% trans "New user" %}</a>
</div>
</div>
<div class="row">
<div class="col">
<table class="table">
<thead>
<tr>
<th scope="col">Email</th>
<th>is Admin</th>
<th></th>
<th></th>
</tr>
<table class="table table-hover table-bordered">
<thead class="table-light">
<tr>
<th scope="col">{% trans "Email" %}</th>
<th scope="col">{% trans "Admin" %}</th>
<th scope="col" class="text-center">{% trans "Actions" %}</th>
</tr>
</thead>
<tbody>
<tr>
{% for u in users %}
<tr>
<td>{{ u.email }}</td>
<td>{{ u.is_admin }}</td>
<td><a href="{% url 'admin:edit_user' u.pk %}"><i class="bi bi-eye"></i></td>
<td><a href="{% url 'admin:delete_user' u.pk %}" class="text-danger" title="Remove"><i class="bi bi-trash"></i></td>
</tr>
{% endfor %}
<td>{% if u.is_admin %}{% trans "Yes" %}{% else %}{% trans "No" %}{% endif %}</td>
<td class="text-center">
<a href="{% url 'admin:edit_user' u.pk %}"><i class="bi bi-pencil me-4"></i></a>
<a href="{% url 'admin:delete_user' u.pk %}" class="text-danger" title="Remove"><i class="bi bi-trash"></i> </a>
</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>

16
api/views.py
View file

@ -85,21 +85,17 @@ class NewSnapshotView(ApiMixing):
# except Exception:
# return JsonResponse({'error': 'Invalid Snapshot'}, status=400)
ev_uuid = data.get("uuid")
if data.get("credentialSubject"):
ev_uuid = data["credentialSubject"].get("uuid")
if not ev_uuid:
if not data.get("uuid"):
txt = "error: the snapshot not have uuid"
logger.error("%s", txt)
return JsonResponse({'status': txt}, status=500)
exist_annotation = Annotation.objects.filter(
uuid=ev_uuid
uuid=data['uuid']
).first()
if exist_annotation:
txt = "error: the snapshot {} exist".format(ev_uuid)
txt = "error: the snapshot {} exist".format(data['uuid'])
logger.warning("%s", txt)
return JsonResponse({'status': txt}, status=500)
@ -109,14 +105,14 @@ class NewSnapshotView(ApiMixing):
except Exception as err:
if settings.DEBUG:
logger.exception("%s", err)
snapshot_id = ev_uuid
snapshot_id = data.get("uuid", "")
txt = "It is not possible to parse snapshot: %s."
logger.error(txt, snapshot_id)
text = "fail: It is not possible to parse snapshot"
return JsonResponse({'status': text}, status=500)
annotation = Annotation.objects.filter(
uuid=ev_uuid,
uuid=data['uuid'],
type=Annotation.Type.SYSTEM,
# TODO this is hardcoded, it should select the user preferred algorithm
key="hidalgo1",
@ -125,7 +121,7 @@ class NewSnapshotView(ApiMixing):
if not annotation:
logger.error("Error: No annotation for uuid: %s", ev_uuid)
logger.error("Error: No annotation for uuid: %s", data["uuid"])
return JsonResponse({'status': 'fail'}, status=500)
url_args = reverse_lazy("device:details", args=(annotation.value,))

39
dashboard/templates/base.html
View file

@ -1,4 +1,4 @@
{% load i18n static %}
{% load i18n static language_code %}
<!doctype html>
<html lang="en">
@ -7,7 +7,7 @@
{% block meta %}
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="robots" content="NONE,NOARCHIVE" />
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="viewp ort" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
<meta name="author" content="Pangea">
{% endblock %}
@ -107,7 +107,7 @@
<ul class="flex-column mb-2 ul_sidebar accordion-collapse {% if path == 'unassigned_devices' %}expanded{% else %}collapse{% endif %}" id="ul_devices" data-bs-parent="#sidebarMenu">
<li class="nav-item">
<a class="nav-link{% if path == 'unassigned_devices' %} active2{% endif %}" href="{% url 'dashboard:unassigned_devices' %}">
{% trans 'Unassigned devices' %}
{% trans 'Unassigned' %}
</a>
</li>
</ul>
@ -135,7 +135,7 @@
<ul class="flex-column mb-2 ul_sidebar accordion-collapse {% if path in 'upload list' %}expanded{% else %}collapse{% endif %}" id="ul_evidences" data-bs-parent="#sidebarMenu">
<li class="nav-item">
<a class="nav-link{% if path == 'upload' %} active2{% endif %}" href="{% url 'evidence:upload' %}">
{% trans 'Upload one' %}
{% trans 'Upload' %}
</a>
</li>
<li class="nav-item">
@ -153,12 +153,12 @@
<ul class="flex-column mb-2 ul_sidebar accordion-collapse {% if path in 'import add' %}expanded{% else %}collapse{% endif %}" id="ul_placeholders" data-bs-parent="#sidebarMenu">
<li class="nav-item">
<a class="nav-link{% if path == 'import' %} active2{% endif %}" href="{% url 'evidence:import' %}">
{% trans 'Upload Spreadsheet' %}
{% trans 'Import from spreadsheet' %}
</a>
</li>
<li class="nav-item">
<a class="nav-link{% if path == 'add' %} active2{% endif %}" href="{% url 'device:add' %}">
{% trans 'Create one' %}
{% trans 'Add device' %}
</a>
</li>
</ul>
@ -183,7 +183,7 @@
<form method="post" action="{% url 'dashboard:search' %}">
{% csrf_token %}
<div class="input-group rounded">
<input type="search" name="search" class="form-control rounded" placeholder="Search your device..." aria-label="Search" aria-describedby="search-addon" />
<input type="search" name="search" class="form-control rounded" placeholder="{% trans 'Search your device' %}" aria-label="Search" aria-describedby="search-addon" />
<span class="input-group-text border-0" id="search-addon">
<i class="fas fa-search"></i>
</span>
@ -207,10 +207,29 @@
</div>
</div>
<!-- Footer -->
<!-- Footer -->
<footer class="footer text-center mt-auto py-3">
<div class="container">
<span class="text-muted">{{ commit_id }}</span>
<div class="container d-flex justify-content-center align-items-center">
<span class="text-muted mx-auto">{{ commit_id }}</span>
<div class="dropdown ms-auto">
<form action="{% url 'set_language' %}" method="post">
{% csrf_token %}
<button class="btn btn-tertiary dropdown-toggle" type="button" id="languageDropdown" data-bs-toggle="dropdown" aria-expanded="false">
{% get_current_language as LANGUAGE_CODE %}
{% get_language_info_list for LANGUAGES as languages %}
{{ LANGUAGE_CODE|get_language_code:languages }}
</button>
<ul class="dropdown-menu dropdown-menu-end" aria-labelledby="languageDropdown">
{% for lang in languages %}
<li>
<button class="dropdown-item" type="submit" name="language" value="{{ lang.code }}">{{ lang.name_local }}</button>
</li>
{% endfor %}
</ul>
</form>
<div>
</div>
</footer>

119
dashboard/templates/unassigned_devices.html
View file

@ -4,18 +4,18 @@
{% block content %}
<div class="row">
<div class="row mb-4">
<div class="col">
<h3>{{ subtitle }}</h3>
</div>
<div class="col text-center">
<div class="col d-flex justify-content-end align-items-center">
{% if lot %}
<a href="{% url 'lot:documents' object.id %}" type="button" class="btn btn-green-admin">
<a href="{% url 'lot:documents' object.id %}" type="button" class="btn btn-green-admin me-2">
<i class="bi bi-folder2"></i>
{% trans 'Documents' %}
</a>
{% endif %}
<a href="{# url 'dashboard:exports' object.id #}" type="button" class="btn btn-green-admin">
<a href="{# url 'dashboard:exports' object.id #}" type="button" class="btn btn-green-admin me-2">
<i class="bi bi-reply"></i>
{% trans 'Exports' %}
</a>
@ -28,63 +28,78 @@
</div>
</div>
<div class="dataTable-container">
<div class="dataTable-container mt-4">
<form method="post">
{% csrf_token %}
<table class="table">
<thead>
<tr>
<th scope="col" data-sortable="">
select
</th>
<th scope="col" data-sortable="">
shortid
</th>
<th scope="col" data-sortable="">
type
</th>
<th scope="col" data-sortable="">
manufacturer
</th>
<th scope="col" data-sortable="">
model
</th>
</tr>
</thead>
{% for dev in devices %}
<tbody>
<tr>
<td>
<input type="checkbox" name="devices" value="{{ dev.id }}" />
</td>
<td>
<a href="{% url 'device:details' dev.id %}">
{{ dev.shortid }}
</a>
</td>
<td>
{% csrf_token %}
<table class="table table-hover table-bordered">
<thead class="table-light">
<tr>
<th scope="col" class="text-center">
<input type="checkbox" id="select-all" />
</th>
<th scope="col" class="text-center">
{% trans "Short ID" %}
</th>
<th scope="col" class="text-center">
{% trans "Type" %}
</th>
<th scope="col" class="text-center">
{% trans "Manufacturer" %}
</th>
<th scope="col" class="text-center">
{% trans "Model" %}
</th>
</tr>
</thead>
<tbody>
{% for dev in devices %}
<tr>
<td class="text-center">
<input type="checkbox" name="devices" value="{{ dev.id }}" />
</td>
<td class="text-center">
<a href="{% url 'device:details' dev.id %}">
{{ dev.shortid }}
</a>
</td>
<td class="text-center">
{{ dev.type }}
</td>
<td>
</td>
<td class="text-center">
{{ dev.manufacturer }}
</td>
<td>
{% if dev.version %}
{{dev.version}} {{ dev.model }}
{% else %}
</td>
<td class="text-center">
{{ dev.model }}
{% endif %}
</td>
</tr>
</tbody>
{% endfor %}
</table>
<button class="btn btn-green-admin" type="submit" value="{% url 'lot:del_devices' %}" name="url">Remove</button> <button class="btn btn-green-admin" type="submit" name="url" value="{% url 'lot:add_devices' %}">add</button>
</td>
</tr>
{% endfor %}
</tbody>
</table>
<div class="d-flex justify-content-start mt-5">
<button id="remove-button" class="btn btn-danger me-2" type="submit" value="{% url 'lot:del_devices' %}" name="url" disabled>
<i class="bi bi-trash"></i> {% trans 'Remove' %}
</button>
<button class="btn btn-success" type="submit" name="url" value="{% url 'lot:add_devices' %}">
{% trans 'Add' %}
</button>
</div>
</form>
</div>
<div class="row mt-3">
<div class="col">
{% render_pagination page total_pages limit %}
</div>
</div>
<script>
// Placeholder check-all js
document.getElementById('select-all').onclick = function() {
var checkboxes = document.querySelectorAll('input[type="checkbox"]');
for (var checkbox of checkboxes) {
checkbox.checked = this.checked;
}
}
</script>
{% endblock %}

11
dashboard/templatetags/language_code.py Normal file
View file

@ -0,0 +1,11 @@
from django import template
from django.utils.translation import get_language_info
register = template.Library()
@register.filter
def get_language_code(language_code, languages):
for lang in languages:
if lang['code'] == language_code:
return lang['name_local'].lower()
return language_code.lower()

7
dashboard/views.py
View file

@ -84,11 +84,8 @@ class SearchView(InventaryMixin):
return devices, count
def get_annotations(self, xp):
snap = json.loads(xp.document.get_data())
if snap.get("credentialSubject"):
uuid = snap["credentialSubject"]["uuid"]
else:
uuid = snap["uuid"]
snap = xp.document.get_data()
uuid = json.loads(snap).get('uuid')
return Device.get_annotation_from_uuid(uuid, self.request.user.institution)
def search_hids(self, query, offset, limit):

14
device/forms.py
View file

@ -1,8 +1,8 @@
from django import forms
from utils.device import create_annotation, create_doc, create_index
from utils.save_snapshots import move_json, save_in_disk
from django.utils.translation import gettext_lazy as _
#TODO: translate device types
DEVICE_TYPES = [
("Desktop", "Desktop"),
("Laptop", "Laptop"),
@ -22,11 +22,11 @@ DEVICE_TYPES = [
class DeviceForm(forms.Form):
type = forms.ChoiceField(choices = DEVICE_TYPES, required=False)
amount = forms.IntegerField(required=False, initial=1)
custom_id = forms.CharField(required=False)
name = forms.CharField(required=False)
value = forms.CharField(required=False)
type = forms.ChoiceField(choices = DEVICE_TYPES, required=False, label= _(u"Type"))
amount = forms.IntegerField(required=False, initial=1, label= _(u"Amount"))
custom_id = forms.CharField(required=False, label=_(u"Custom id"))
name = forms.CharField(required=False, label= _(u"Name"))
value = forms.CharField(required=False, label=_(u"Value"))
class BaseDeviceFormSet(forms.BaseFormSet):

36
device/models.py
View file

@ -25,7 +25,6 @@ class Device:
def __init__(self, *args, **kwargs):
# the id is the chid of the device
self.id = kwargs["id"]
self.uuid = kwargs.get("uuid")
self.pk = self.id
self.shortid = self.pk[:6].upper()
self.algorithm = None
@ -104,19 +103,11 @@ class Device:
self.evidences = [Evidence(u) for u in self.uuids]
def get_last_evidence(self):
if self.last_evidence:
return
if self.uuid:
self.last_evidence = Evidence(self.uuid)
return
annotations = self.get_annotations()
if not annotations.count():
return
annotation = annotations.first()
self.last_evidence = Evidence(annotation.uuid)
self.uuid = annotation.uuid
def is_eraseserver(self):
if not self.uuids:
@ -135,8 +126,6 @@ class Device:
return False
def last_uuid(self):
if self.uuid:
return self.uuid
return self.uuids[0]
def get_lots(self):
@ -274,44 +263,45 @@ class Device:
@property
def is_websnapshot(self):
self.get_last_evidence()
if not self.last_evidence:
self.get_last_evidence()
return self.last_evidence.doc['type'] == "WebSnapshot"
@property
def last_user_evidence(self):
self.get_last_evidence()
if not self.last_evidence:
self.get_last_evidence()
return self.last_evidence.doc['kv'].items()
@property
def manufacturer(self):
self.get_last_evidence()
if not self.last_evidence:
self.get_last_evidence()
return self.last_evidence.get_manufacturer()
@property
def serial_number(self):
self.get_last_evidence()
if not self.last_evidence:
self.get_last_evidence()
return self.last_evidence.get_serial_number()
@property
def type(self):
self.get_last_evidence()
if self.last_evidence.doc['type'] == "WebSnapshot":
return self.last_evidence.doc.get("device", {}).get("type", "")
if not self.last_evidence:
self.get_last_evidence()
return self.last_evidence.get_chassis()
@property
def model(self):
self.get_last_evidence()
if not self.last_evidence:
self.get_last_evidence()
return self.last_evidence.get_model()
@property
def version(self):
def components(self):
if not self.last_evidence:
self.get_last_evidence()
return self.last_evidence.get_version()
@property
def components(self):
self.get_last_evidence()
return self.last_evidence.get_components()

45
device/templates/details.html
View file

@ -29,11 +29,6 @@
<li class="nav-item">
<a href="#evidences" class="nav-link" data-bs-toggle="tab" data-bs-target="#evidences">{% trans 'Evidences' %}</a>
</li>
{% if dpps %}
<li class="nav-item">
<a href="#dpps" class="nav-link" data-bs-toggle="tab" data-bs-target="#dpps">{% trans 'Dpps' %}</a>
</li>
{% endif %}
<li class="nav-item">
<a class="nav-link" href="{% url 'device:device_web' object.id %}" target="_blank">Web</a>
</li>
@ -58,41 +53,34 @@
</div>
{% endif %}
<div class="row mb-1">
<div class="row mb-3">
<div class="col-lg-3 col-md-4 label">Type</div>
<div class="col-lg-9 col-md-8">{{ object.type }}</div>
</div>
{% if object.is_websnapshot and object.last_user_evidence %}
{% for k, v in object.last_user_evidence %}
<div class="row mb-1">
<div class="row mb-3">
<div class="col-lg-3 col-md-4 label">{{ k }}</div>
<div class="col-lg-9 col-md-8">{{ v|default:'' }}</div>
</div>
{% endfor %}
{% else %}
<div class="row mb-1">
<div class="row mb-3">
<div class="col-lg-3 col-md-4 label">
{% trans 'Manufacturer' %}
</div>
<div class="col-lg-9 col-md-8">{{ object.manufacturer|default:'' }}</div>
</div>
<div class="row mb-1">
<div class="row mb-3">
<div class="col-lg-3 col-md-4 label">
{% trans 'Model' %}
</div>
<div class="col-lg-9 col-md-8">{{ object.model|default:'' }}</div>
</div>
<div class="row mb-1">
<div class="col-lg-3 col-md-4 label">
{% trans 'Version' %}
</div>
<div class="col-lg-9 col-md-8">{{ object.version|default:'' }}</div>
</div>
<div class="row mb-1">
<div class="row mb-3">
<div class="col-lg-3 col-md-4 label">
{% trans 'Serial Number' %}
</div>
@ -241,25 +229,6 @@
{% endfor %}
</div>
</div>
{% if dpps %}
<div class="tab-pane fade" id="dpps">
<h5 class="card-title">{% trans 'List of dpps' %}</h5>
<div class="list-group col">
{% for d in dpps %}
<div class="list-group-item">
<div class="d-flex w-100 justify-content-between">
<small class="text-muted">{{ d.timestamp }}</small>
<span>{{ d.type }}</span>
</div>
<p class="mb-1">
<a href="{% url 'did:device_web' d.signature %}">{{ d.signature }}</a>
</p>
</div>
{% endfor %}
</div>
</div>
{% endif %}
</div>
{% endblock %}
@ -268,12 +237,12 @@
document.addEventListener('DOMContentLoaded', function () {
// Obtener el hash de la URL (ejemplo: #components)
const hash = window.location.hash
// Verificar si hay un hash en la URL
if (hash) {
// Buscar el botón o enlace que corresponde al hash y activarlo
const tabTrigger = document.querySelector(`[data-bs-target="${hash}"]`)
if (tabTrigger) {
// Crear una instancia de tab de Bootstrap para activar el tab
const tab = new bootstrap.Tab(tabTrigger)

14
device/views.py
View file

@ -1,5 +1,7 @@
import json
from django.http import JsonResponse
from django.conf import settings
from django.http import Http404
from django.urls import reverse_lazy
from django.shortcuts import get_object_or_404, Http404
from django.utils.translation import gettext_lazy as _
@ -14,9 +16,6 @@ from evidence.models import Annotation
from lot.models import LotTag
from device.models import Device
from device.forms import DeviceFormSet
if settings.DPP:
from dpp.models import Proof
from dpp.api_dlt import PROOF_TYPE
class NewDeviceView(DashboardView, FormView):
@ -104,17 +103,10 @@ class DetailsView(DashboardView, TemplateView):
context = super().get_context_data(**kwargs)
self.object.initial()
lot_tags = LotTag.objects.filter(owner=self.request.user.institution)
dpps = []
if settings.DPP:
dpps = Proof.objects.filter(
uuid__in=self.object.uuids,
type=PROOF_TYPE["IssueDPP"]
)
context.update({
'object': self.object,
'snapshot': self.object.get_last_evidence(),
'lot_tags': lot_tags,
'dpps': dpps,
})
return context

25
dhub/settings.py
View file

@ -65,6 +65,9 @@ ENABLE_EMAIL = config("ENABLE_EMAIL", default=True, cast=bool)
EVIDENCES_DIR = config("EVIDENCES_DIR", default=os.path.join(BASE_DIR, "db"))
LOCALE_PATHS = [
os.path.join(BASE_DIR, 'locale'),
]
# Application definition
INSTALLED_APPS = [
@ -91,11 +94,6 @@ INSTALLED_APPS = [
"api",
]
DPP = config("DPP", default=False, cast=bool)
if DPP:
INSTALLED_APPS.extend(["dpp", "did"])
MIDDLEWARE = [
"django.middleware.security.SecurityMiddleware",
@ -121,7 +119,13 @@ TEMPLATES = [
"django.template.context_processors.request",
"django.contrib.auth.context_processors.auth",
"django.contrib.messages.context_processors.messages",
"django.template.context_processors.i18n",
],
'libraries':{
'get_language_code': 'dashboard.templatetags.language_code',
}
},
},
]
@ -174,8 +178,9 @@ if TIME_ZONE == "UTC":
USE_L10N = True
LANGUAGES = [
('es', 'Spanish'),
('en', 'English'),
('es', 'spanish'),
('en', 'english'),
('ca', 'català'),
]
# Static files (CSS, JavaScript, Images)
@ -244,9 +249,3 @@ LOGGING = {
SNAPSHOT_PATH="/tmp/"
DATA_UPLOAD_MAX_NUMBER_FILES = 1000
COMMIT = config('COMMIT', default='')
# DLT SETTINGS
TOKEN_DLT = config("API_DLT_TOKEN", default=None)
API_DLT = config("API_DLT", default=None)
API_RESOLVER = config("API_RESOLVER", default=None)
ID_FEDERATED = config("ID_FEDERATED", default=None)

18
dhub/urls.py
View file

@ -14,8 +14,12 @@ Including another URLconf
1. Import the include() function: from django.urls import include, path
2. Add a URL to urlpatterns: path('blog/', include('blog.urls'))
"""
from django.conf import settings
from django.urls import path, include
from django.conf.urls.i18n import i18n_patterns
from django.conf import settings
from django.conf.urls.static import static
from django.views.i18n import set_language
urlpatterns = [
# path('api/', include('snapshot.urls')),
@ -29,8 +33,10 @@ urlpatterns = [
path('api/', include('api.urls')),
]
if settings.DPP:
urlpatterns.extend([
path('dpp/', include('dpp.urls')),
path('did/', include('did.urls')),
])
urlpatterns += i18n_patterns(
path("language/", set_language, name='set_language'),
)
if settings.DEBUG:
urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

0
did/__init__.py
View file

3
did/admin.py
View file

@ -1,3 +0,0 @@
from django.contrib import admin
# Register your models here.

6
did/apps.py
View file

@ -1,6 +0,0 @@
from django.apps import AppConfig
class DidConfig(AppConfig):
default_auto_field = "django.db.models.BigAutoField"
name = "did"

0
did/migrations/__init__.py
View file

3
did/models.py
View file

@ -1,3 +0,0 @@
from django.db import models
# Create your models here.

41
did/template_credential.py
View file

@ -1,41 +0,0 @@
dpp_tmpl = {
"@context": [
"https://www.w3.org/ns/credentials/v2",
"https://test.uncefact.org/vocabulary/untp/dpp/0.5.0/"
],
"type": [
"DigitalProductPassport",
"VerifiableCredential"
],
"id": "https://example.ereuse.org/credentials/2a423366-a0d6-4855-ba65-2e0c926d09b0",
"issuer": {
"type": [
"CredentialIssuer"
],
"id": "did:web:r1.identifiers.ereuse.org:did-registry:z6Mkoreij5y9bD9fL5SGW6TfMUmcbaV7LCPwZHCFEEZBrVYQ#z6Mkoreij5y9bD9fL5SGW6TfMUmcbaV7LCPwZHCFEEZBrVYQ",
"name": "Refurbisher One"
},
"validFrom": "2024-11-15T12:00:00",
"validUntil": "2034-11-15T12:00:00",
"credentialSubject": {
"type": [
"Product"
],
"id": "https://id.ereuse.org/01/09520123456788/21/12345",
"name": "Refurbished XYZ Lenovo laptop item",
"registeredId": "09520123456788.21.12345",
"description": "XYZ Lenovo laptop refurbished by Refurbisher One",
"data": ""
},
"credentialSchema": {
"id": "https://idhub.pangea.org/vc_schemas/dpp.json",
"type": "FullJsonSchemaValidator2021",
"proof": {
"type": "Ed25519Signature2018",
"proofPurpose": "assertionMethod",
"verificationMethod": "did:web:r1.identifiers.ereuse.org:did-registry:z6Mkoreij5y9bD9fL5SGW6TfMUmcbaV7LCPwZHCFEEZBrVYQ#z6Mkoreij5y9bD9fL5SGW6TfMUmcbaV7LCPwZHCFEEZBrVYQ",
"created": "2024-12-03T15:33:42Z",
"jws": "eyJhbGciOiJFZERTQSIsImNyaXQiOlsiYjY0Il0sImI2NCI6ZmFsc2V9..rBPqbOcZCXB7GAnq1XIfV9Jvw4MKXlHff7qZkRfgwQ0Hnd9Ujt5s1xT4O0K6VESzWvdP2mOvMvu780fVNfraBQ"
}
}
}

497
did/templates/device_did.html
View file

@ -1,497 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>{{ object.type }}</title>
<link href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.1.3/css/bootstrap.min.css" rel="stylesheet" />
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.1/font/bootstrap-icons.css" />
<style>
body {
font-size: 0.875rem;
background-color: #f8f9fa;
display: flex;
flex-direction: column;
min-height: 100vh;
}
.custom-container {
background-color: #ffffff;
border-radius: 10px;
box-shadow: 0 0 20px rgba(0, 0, 0, 0.1);
padding: 30px;
margin-top: 30px;
flex-grow: 1;
}
.section-title {
color: #7a9f4f;
border-bottom: 2px solid #9cc666;
padding-bottom: 10px;
margin-bottom: 20px;
font-size: 1.5em;
}
.info-row {
margin-bottom: 10px;
}
.info-label {
font-weight: bold;
color: #545f71;
}
.info-value {
color: #333;
}
.component-card {
background-color: #f8f9fa;
border-left: 4px solid #9cc666;
margin-bottom: 15px;
transition: all 0.3s ease;
}
.component-card:hover {
box-shadow: 0 5px 15px rgba(0, 0, 0, 0.1);
transform: translateY(-2px);
}
.hash-value {
word-break: break-all;
background-color: #f3f3f3;
padding: 5px;
border-radius: 4px;
font-family: monospace;
font-size: 0.9em;
border: 1px solid #e0e0e0;
}
.card-title {
color: #9cc666;
}
.btn-primary {
background-color: #9cc666;
border-color: #9cc666;
padding: 0.1em 2em;
font-weight: 700;
}
.btn-primary:hover {
background-color: #8ab555;
border-color: #8ab555;
}
.btn-green-user {
background-color: #c7e3a3;
}
.btn-grey {
background-color: #f3f3f3;
}
footer {
background-color: #545f71;
color: #ffffff;
text-align: center;
padding: 10px 0;
margin-top: 20px;
}
</style>
</head>
<body>
<div class="container custom-container">
<nav class="header-nav ms-auto">
<div class="d-flex align-items-right">
<span class="nav-item">
{% if not roles and user.is_anonymous %}
<button class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#validateModal">Validate</button>
{% else %}
<button class="btn btn-primary" id="buttonRole" data-bs-toggle="modal" data-bs-target="#rolesModal">Select your role</button>
<a class="btn btn-primary" href="{% url 'login:logout' %}?next={{ path }}">Logout</a>
{% endif %}
</span>
</div>
{% if role %}
<div class="d-flex justify-content-end">
<span class="nav-item">
Current Role: {{ role }}
</span>
</div>
{% endif %}
</nav>
<h1 class="text-center mb-4" style="color: #545f71;">{{ object.manufacturer }} {{ object.type }} {{ object.model }}</h1>
<div class="row">
<div class="col-lg-6">
{% if manuals.details.logo %}
<img style="max-width: 50px; margin-right: 15px;" src="{{ manuals.details.logo }}" />
{% endif %}
</div>
<div class="col-lg-6">
{% if manuals.details.image %}
<img style="width: 100px;" src="{{ manuals.details.image }}" />
{% endif %}
</div>
</div>
<div class="row">
<div class="col-lg-6">
<h2 class="section-title">Details</h2>
<div class="info-row row">
<div class="col-md-4 info-label">Phid</div>
<div class="col-md-8 info-value">
<div class="hash-value">{{ object.id }}</div>
</div>
</div>
<div class="info-row row">
<div class="col-md-4 info-label">Type</div>
<div class="col-md-8 info-value">{{ object.type }}</div>
</div>
{% if object.is_websnapshot %}
{% for snapshot_key, snapshot_value in object.last_user_evidence %}
<div class="info-row row">
<div class="col-md-4 info-label">{{ snapshot_key }}</div>
<div class="col-md-8 info-value">{{ snapshot_value|default:'' }}</div>
</div>
{% endfor %}
{% else %}
<div class="info-row row">
<div class="col-md-4 info-label">Manufacturer</div>
<div class="col-md-8 info-value">{{ object.manufacturer|default:'' }}</div>
</div>
<div class="info-row row">
<div class="col-md-4 info-label">Model</div>
<div class="col-md-8 info-value">{{ object.model|default:'' }}</div>
</div>
{% if user.is_authenticated %}
<div class="info-row row">
<div class="col-md-4 info-label">Serial Number</div>
<div class="col-md-8 info-value">{{ object.serial_number|default:'' }}</div>
</div>
{% endif %}
{% endif %}
</div>
<div class="col-lg-6">
<h2 class="section-title">Identifiers</h2>
{% for chid in object.hids %}
<div class="info-row">
<div class="hash-value">{{ chid|default:'' }}</div>
</div>
{% endfor %}
</div>
</div>
<h2 class="section-title mt-5">Components</h2>
<div class="row">
{% for component in object.components %}
<div class="col-md-6 mb-3">
<div class="card component-card">
<div class="card-body">
<h5 class="card-title">{{ component.type }}</h5>
<p class="card-text">
{% for component_key, component_value in component.items %}
{% if component_key not in 'actions,type' %}
{% if component_key != 'serialNumber' or user.is_authenticated %}
<strong>{{ component_key }}:</strong> {{ component_value }}<br />
{% endif %}
{% endif %}
{% endfor %}
</p>
</div>
</div>
</div>
{% endfor %}
</div>
{% if manuals.icecat %}
<h5 class="card-title">Icecat data sheet</h5>
<div class="row">
<div class="col-12 list-group-item d-flex align-items-center">
{% if manuals.details.logo %}
<img style="max-width: 50px; margin-right: 15px;" src="{{ manuals.details.logo }}" />
{% endif %}
{% if manuals.details.image %}
<img style="max-width: 100px; margin-right: 15px;" src="{{ manuals.details.image }}" />
{% endif %}
{% if manuals.details.pdf %}
<a href="{{ manuals.details.pdf }}" target="_blank">{{ manuals.details.title }}</a><br />
{% else %}
{{ manuals.details.title }}<br />
{% endif %}
</div>
<div class="col-12 accordion-item">
<h5 class="card-title accordion-header">
<button class="accordion-button collapsed" data-bs-target="#manuals-icecat" type="button"
data-bs-toggle="collapse" aria-expanded="false">
More examples
</button>
</h5>
<div id="manuals-icecat" class="row accordion-collapse collapse">
<div class="accordion-body">
{% for m in manuals.icecat %}
<div class="list-group-item d-flex align-items-center">
{% if m.logo %}
<img style="max-width: 50px; margin-right: 15px;" src="{{ m.logo }}" />
{% endif %}
{% if m.pdf %}
<a href="{{ m.pdf }}" target="_blank">{{ m.title }}</a><br />
{% else %}
{{ m.title }}<br />
{% endif %}
</div>
{% endfor %}
</div>
</div>
</div>
</div>
{% endif %}
{% if manuals.laer %}
<div class="row mt-3">
<div class="col-12">
<h5 class="card-title">Recycled Content</h5>
<div class="row mb-3">
<div class="col-sm-2">
Metal
</div>
<div class="col-sm-10">
<div class="progress">
<div class="progress-bar"
role="progressbar"
style="width: {{ manuals.laer.0.metal }}%"
aria-valuenow="{{ manuals.laer.0.metal }}"
aria-valuemin="0"
aria-valuemax="100">{{ manuals.laer.0.metal }}%
</div>
</div>
</div>
</div>
<div class="row mb-3">
<div class="col-sm-2">
Plastic post Consumer
</div>
<div class="col-sm-10">
<div class="progress">
<div class="progress-bar"
role="progressbar"
style="width: {{ manuals.laer.0.plastic_post_consumer }}%"
aria-valuenow="{{ manuals.laer.0.plastic_post_consumer }}"
aria-valuemin="0"
aria-valuemax="100">{{ manuals.laer.0.plastic_post_consumer }}%
</div>
</div>
</div>
</div>
<div class="row mb-3">
<div class="col-sm-2">
Plastic post Industry
</div>
<div class="col-sm-10">
<div class="progress">
<div class="progress-bar"
role="progressbar"
style="width: {{ manuals.laer.0.plastic_post_industry }}%"
aria-valuenow="{{ manuals.laer.0.plastic_post_industry }}"
aria-valuemin="0"
aria-valuemax="100">{{ manuals.laer.0.plastic_post_industry }}%
</div>
</div>
</div>
</div>
</div>
</div>
{% endif %}
{% if manuals.energystar %}
<div class="row mt-3">
<div class="col-12">
<h5 class="card-title">Energy spent</h5>
{% if manuals.energystar.long_idle_watts %}
<div class="row mb-3">
<div class="col-sm-10">
Consumption when inactivity power function is activated (watts)
</div>
<div class="col-sm-2">
{{ manuals.energystar.long_idle_watts }}
</div>
</div>
{% endif %}
{% if manuals.energystar.short_idle_watts %}
<div class="row mb-3">
<div class="col-sm-10">
Consumption when inactivity power function is not activated (watts)
</div>
<div class="col-sm-2">
{{ manuals.energystar.short_idle_watts }}
</div>
</div>
{% endif %}
{% if manuals.energystar.sleep_mode_watts %}
<div class="row mb-3">
<div class="col-sm-10">
sleep_mode_watts
Consumption when computer goes into sleep mode (watts)
</div>
<div class="col-sm-2">
{{ manuals.energystar.sleep_mode_watts }}
</div>
</div>
{% endif %}
{% if manuals.energystar.off_mode_watts %}
<div class="row mb-3">
<div class="col-sm-10">
Consumption when the computer is off (watts)
</div>
<div class="col-sm-2">
{{ manuals.energystar.off_mode_watts }}
</div>
</div>
{% endif %}
{% if manuals.energystar.tec_allowance_kwh %}
<div class="row mb-3">
<div class="col-sm-10">
Power allocation for normal operation (kwh)
</div>
<div class="col-sm-2">
{{ manuals.energystar.tec_allowance_kwh }}
</div>
</div>
{% endif %}
{% if manuals.energystar.tec_of_model_kwh %}
<div class="row mb-3">
<div class="col-sm-10">
Consumption of the model configuration (kwh)
</div>
<div class="col-sm-2">
{{ manuals.energystar.tec_of_model_kwh }}
</div>
</div>
{% endif %}
{% if manuals.energystar.tec_requirement_kwh %}
<div class="row mb-3">
<div class="col-sm-10">
Energy allowance provided (kwh)
</div>
<div class="col-sm-2">
{{ manuals.energystar.tec_requirement_kwh }}
</div>
</div>
{% endif %}
{% if manuals.energystar.work_off_mode_watts %}
<div class="row mb-3">
<div class="col-sm-10">
The lowest power mode which cannot be switched off (watts)
</div>
<div class="col-sm-2">
{{ manuals.energystar.work_off_mode_watts }}
</div>
</div>
{% endif %}
{% if manuals.energystar.work_weighted_power_of_model_watts %}
<div class="row mb-3">
<div class="col-sm-10">
Weighted energy consumption from all its states (watts)
</div>
<div class="col-sm-2">
{{ manuals.energystar.work_weighted_power_of_model_watts }}
</div>
</div>
{% endif %}
</div>
</div>
{% endif %}
{% if manuals.ifixit %}
<div class="row">
<div class="col-12 accordion-item">
<h5 class="card-title accordion-header">
<button class="accordion-button collapsed" data-bs-target="#manuals-repair" type="button"
data-bs-toggle="collapse" aria-expanded="false">
Repair manuals
</button>
</h5>
<div id="manuals-repair" class="row accordion-collapse collapse">
<div class="list-group col">
{% for m in manuals.ifixit %}
<div class="list-group-item d-flex align-items-center">
{% if m.image %}
<img style="max-width: 100px; margin-right: 15px;" src="{{ m.image }}" />
{% endif %}
{% if m.url %}
<a href="{{ m.url }}" target="_blank">{{ m.title }}</a><br />
{% else %}
{{ m.title }}<br />
{% endif %}
</div>
{% endfor %}
</div>
</div>
</div>
</div>
{% endif %}
<footer>
<p>
&copy;{% now 'Y' %}eReuse. All rights reserved.
</p>
</footer>
{% if user.is_anonymous and not roles %}
<div class="modal fade" id="validateModal" tabindex="-1" style="display: none;" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">Validate as <span id="title-action"></span></h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<a class="btn btn-primary" type="button"
href="{% url 'login:login' %}?next={{ path }}">
User of system
</a>
{% if oidc %}
<br />
<a class="btn btn-primary mt-3" type="button" href="{# url 'oidc:login_other_inventory' #}?next={{ path }}">
User of other inventory
</a>
{% endif %}
</div>
<div class="modal-footer"></div>
</div>
</div>
</div>
{% else %}
<div class="modal fade" id="rolesModal" tabindex="-1" style="display: none;" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered">
<div class="modal-content">
<form action="{{ path }}" method="get">
<div class="modal-header">
<h5 class="modal-title">Select your Role <span id="title-action"></span></h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<select name="role">
{% for k, v in roles %}
<option value="{{ k }}" {% if v == role %}selected=selected{% endif %}>{{ v }}</option>
{% endfor %}
</select>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
<input type="submit" class="btn btn-primary" value="Send" />
</div>
</form>
</div>
</div>
</div>
{% endif %}
<script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.1.3/js/bootstrap.bundle.min.js"></script>
</body>
</html>

3
did/tests.py
View file

@ -1,3 +0,0 @@
from django.test import TestCase
# Create your tests here.

8
did/urls.py
View file

@ -1,8 +0,0 @@
from django.urls import path
from did import views
app_name = 'did'
urlpatterns = [
path("<str:pk>", views.PublicDeviceWebView.as_view(), name="device_web"),
]

263
did/views.py
View file

@ -1,263 +0,0 @@
import json
import logging
from django.http import JsonResponse, Http404
from django.views.generic.base import TemplateView
from device.models import Device
from evidence.parse import Build
from dpp.api_dlt import ALGORITHM
from dpp.models import Proof
from dpp.api_dlt import PROOF_TYPE
from did.template_credential import dpp_tmpl
logger = logging.getLogger('django')
class PublicDeviceWebView(TemplateView):
template_name = "device_did.html"
def get(self, request, *args, **kwargs):
self.pk = kwargs['pk']
chid = self.pk.split(":")[0]
proof = Proof.objects.filter(signature=self.pk).first()
if proof:
self.object = Device(id=chid, uuid=proof.uuid)
else:
self.object = Device(id=chid)
if not self.object.last_evidence:
raise Http404
if self.request.headers.get('Accept') == 'application/json':
return self.get_json_response()
return super().get(request, *args, **kwargs)
def get_context_data(self, **kwargs):
self.context = super().get_context_data(**kwargs)
self.object.initial()
roles = [("Operator", "Operator")]
role = "Operator"
if self.request.user.is_anonymous:
roles = []
role = None
self.context.update({
'object': self.object,
'role': role,
'roles': roles,
'path': self.request.path,
'last_dpp': "",
'before_dpp': "",
})
if not self.request.user.is_anonymous:
self.get_manuals()
return self.context
@property
def public_fields(self):
return {
'id': self.object.id,
'shortid': self.object.shortid,
'uuids': self.object.uuids,
'hids': self.object.hids,
'components': self.remove_serial_number_from(self.object.components),
}
@property
def authenticated_fields(self):
return {
'serial_number': self.object.serial_number,
'components': self.object.components,
}
def remove_serial_number_from(self, components):
for component in components:
if 'serial_number' in component:
del component['SerialNumber']
return components
def get_device_data(self):
data = self.public_fields
if self.request.user.is_authenticated:
data.update(self.authenticated_fields)
return data
def get_json_response(self):
device_data = self.get_result()
# device_data = self.get_device_data()
response = JsonResponse(device_data)
response["Access-Control-Allow-Origin"] = "*"
return response
def get_result(self):
if len(self.pk.split(":")) > 1:
return self.build_from_dpp()
else:
return self.build_from_chid()
def build_from_dpp(self):
data = {
'document': {},
'dpp': self.pk,
'algorithm': ALGORITHM,
'components': [],
'manufacturer DPP': '',
'device': {},
}
dev = Build(self.object.last_evidence.doc, None, check=True)
doc = dev.get_phid()
data['document'] = json.dumps(doc)
data['device'] = dev.device
data['components'] = dev.components
self.object.get_evidences()
last_dpp = Proof.objects.filter(
uuid__in=self.object.uuids, type=PROOF_TYPE['IssueDPP']
).order_by("-timestamp").first()
key = self.pk
if last_dpp:
key = last_dpp.signature
url = "https://{}/did/{}".format(
self.request.get_host(),
key
)
data['url_last'] = url
tmpl = dpp_tmpl.copy()
tmpl["credentialSubject"]["data"] = data
return tmpl
def build_from_chid(self):
dpps = []
self.object.initial()
for d in self.object.evidences:
d.get_doc()
dev = Build(d.doc, None, check=True)
doc = dev.get_phid()
ev = json.dumps(doc)
phid = dev.get_signature(doc)
dpp = "{}:{}".format(self.pk, phid)
rr = {
'dpp': dpp,
'document': ev,
'algorithm': ALGORITHM,
'manufacturer DPP': '',
'device': dev.device,
'components': dev.components
}
tmpl = dpp_tmpl.copy()
tmpl["credentialSubject"]["data"] = rr
dpps.append(tmpl)
return {
'@context': ['https://ereuse.org/dpp0.json'],
'data': dpps,
}
def get_manuals(self):
manuals = {
'ifixit': [],
'icecat': [],
'details': {},
'laer': [],
'energystar': {},
}
try:
params = {
"manufacturer": self.object.manufacturer,
"model": self.object.model,
}
self.params = json.dumps(params)
manuals['ifixit'] = self.request_manuals('ifixit')
manuals['icecat'] = self.request_manuals('icecat')
manuals['laer'] = self.request_manuals('laer')
manuals['energystar'] = self.request_manuals('energystar') or {}
if manuals['icecat']:
manuals['details'] = manuals['icecat'][0]
except Exception as err:
logger.error("Error: {}".format(err))
self.context['manuals'] = manuals
self.parse_energystar()
def parse_energystar(self):
if not self.context.get('manuals', {}).get('energystar'):
return
# Defined in:
# https://dev.socrata.com/foundry/data.energystar.gov/j7nq-iepp
energy_types = [
'functional_adder_allowances_kwh',
'tec_allowance_kwh',
'long_idle_watts',
'short_idle_watts',
'off_mode_watts',
'sleep_mode_watts',
'tec_of_model_kwh',
'tec_requirement_kwh',
'work_off_mode_watts',
'work_weighted_power_of_model_watts',
]
energy = {}
for field in energy_types:
energy[field] = []
for e in self.context['manuals']['energystar']:
for field in energy_types:
for k, v in e.items():
if not v:
continue
if field in k:
energy[field].append(v)
for k, v in energy.items():
if not v:
energy[k] = 0
continue
tt = sum([float(i) for i in v])
energy[k] = round(tt / len(v), 2)
self.context['manuals']['energystar'] = energy
def request_manuals(self, prefix):
#TODO reimplement manuals service
response = {
"laer": [{"metal": 40, "plastic_post_consumer": 27, "plastic_post_industry": 34}],
"energystar": [{
'functional_adder_allowances_kwh': 180,
"long_idle_watts": 240,
"short_idle_watts": 120,
"sleep_mode_watts": 30,
"off_mode_watts": 3,
"tec_allowance_kwh": 180,
"tec_of_model_kwh": 150,
"tec_requirement_kwh": 220,
"work_off_mode_watts": 70,
"work_weighted_power_of_model_watts": 240
}],
"ifixit": [
{
"image": "https://guide-images.cdn.ifixit.com/igi/156EpI4YdQeVfVPa.medium",
"url": "https://es.ifixit.com/Gu%C3%ADa/HP+ProBook+450+G4+Back+Panel+Replacement/171196?lang=en",
"title": "HP ProBook 450 G4 Back Panel Replacement"
},
{
"image": "https://guide-images.cdn.ifixit.com/igi/usTIqCKpuxVWC3Ix.140x105",
"url": "https://es.ifixit.com/Gu%C3%ADa/HP+ProBook+450+G4+Display+Assembly+Replacement/171101?lang=en",
"title": "Display Assembly Replacement"
}
],
"icecat": [
{
"logo": "https://images.icecat.biz/img/brand/thumb/1_cf8603f6de7b4c4d8ac4f5f0ef439a05.jpg",
"image": "https://guide-images.cdn.ifixit.com/igi/Q2nYjTIQfG6GaI5B.standard",
"pdf": "https://icecat.biz/rest/product-pdf?productId=32951710&lang=en",
"title": "HP ProBook 450 G3"
}
]
}
return response.get(prefix, {})

1
docker-compose.yml
View file

@ -9,7 +9,6 @@ services:
- ALLOWED_HOSTS=${ALLOWED_HOSTS:-$DOMAIN}
- DEMO=${DEMO:-false}
- PREDEFINED_TOKEN=${PREDEFINED_TOKEN:-}
- DPP=${DPP:-false}
volumes:
- .:/opt/devicehub-django
ports:

4
docker-reset.sh
View file

@ -20,9 +20,7 @@ main() {
echo "WARNING: .env was not there, .env.example was copied, this only happens once"
fi
# remove old database
rm -vfr ./db/*
# deactivate configured flag
rm -vfr ./already_configured
sudo rm -vfr ./db/*
docker compose down -v
docker compose build
docker compose up ${detach_arg:-}

16
docker/devicehub-django.Dockerfile
View file

@ -5,16 +5,11 @@ RUN apt update && \
apt-get install -y \
python3-xapian \
git \
gettext \
sqlite3 \
jq \
time \
vim \
&& rm -rf /var/lib/apt/lists/*
# TODO I don't like this, but the whole ereuse-dpp works with user 1000 because of the volume mapping
# thanks https://stackoverflow.com/questions/70520205/docker-non-root-user-best-practices-for-python-images
RUN adduser --home /opt/devicehub-django -u 1000 app
WORKDIR /opt/devicehub-django
# reduce size (python specifics) -> src https://stackoverflow.com/questions/74616667/removing-pip-cache-after-installing-dependencies-in-docker-image
@ -28,18 +23,15 @@ compile = no
no-cache-dir = True
END
# upgrade pip, which might fail on lxc, then remove the "corrupted file"
RUN python -m pip install --upgrade pip || (rm -rf /usr/local/lib/python3.11/site-packages/pip-*.dist-info && python -m pip install --upgrade pip)
COPY ./requirements.txt /opt/devicehub-django
RUN pip install -r requirements.txt
# TODO hardcoded, is ignored in requirements.txt
RUN pip install -i https://test.pypi.org/simple/ ereuseapitest==0.0.14
# TODO Is there a better way?
# Set PYTHONPATH to include the directory with the xapian module
ENV PYTHONPATH="${PYTHONPATH}:/usr/lib/python3/dist-packages"
COPY docker/devicehub-django.entrypoint.sh /
RUN chown -R app:app /opt/devicehub-django
USER app
ENTRYPOINT sh /devicehub-django.entrypoint.sh

159
docker/devicehub-django.entrypoint.sh
View file

@ -5,149 +5,6 @@ set -u
# DEBUG
set -x
# TODO there is a conflict between two shared vars
# 1. from the original docker compose devicehub-teal
# 2. from the new docker compose that integrates all dpp services
wait_for_dpp_shared() {
while true; do
# specially ensure VERAMO_API_CRED_FILE is not empty,
# it takes some time to get data in
OPERATOR_TOKEN_FILE='operator-token.txt'
if [ -f "/shared/${OPERATOR_TOKEN_FILE}" ] && \
[ -f "/shared/create_user_operator_finished" ]; then
sleep 5
echo "Files ready to process."
break
else
echo "Waiting for file in shared: ${OPERATOR_TOKEN_FILE}"
sleep 5
fi
done
}
# 3. Generate an environment .env file.
# TODO cargar via shared
gen_env_vars() {
INIT_ORG="${INIT_ORG:-example-org}"
INIT_USER="${INIT_USER:-user@example.org}"
INIT_PASSWD="${INIT_PASSWD:-1234}"
ADMIN='True'
PREDEFINED_TOKEN="${PREDEFINED_TOKEN:-}"
# specific dpp env vars
if [ "${DPP:-}" = 'true' ]; then
# fill env vars in this docker entrypoint
wait_for_dpp_shared
export API_DLT='http://api_connector:3010'
export API_DLT_TOKEN="$(cat "/shared/${OPERATOR_TOKEN_FILE}")"
export API_RESOLVER='http://id_index_api:3012'
# TODO hardcoded
export ID_FEDERATED='DH1'
# propagate to .env
dpp_env_vars="$(cat <<END
API_DLT=${API_DLT}
API_DLT_TOKEN=${API_DLT_TOKEN}
API_RESOLVER=${API_RESOLVER}
ID_FEDERATED=${ID_FEDERATED}
END
)"
# generate config using env vars from docker
# TODO rethink if this is needed because now this is django, not flask
cat > .env <<END
${dpp_env_vars:-}
END
fi
}
handle_federated_id() {
# devicehub host and id federated checker
# //getAll queries are not accepted by this service, so we remove them
EXPECTED_ID_FEDERATED="$(curl -s "${API_RESOLVER%/}/getAll" \
| jq -r '.url | to_entries | .[] | select(.value == "'"${DEVICEHUB_HOST}"'") | .key' \
| head -n 1)"
# if is a new DEVICEHUB_HOST, then register it
if [ -z "${EXPECTED_ID_FEDERATED}" ]; then
# TODO better docker compose run command
cmd="docker compose run --entrypoint= devicehub flask dlt_insert_members ${DEVICEHUB_HOST}"
big_error "No FEDERATED ID maybe you should run \`${cmd}\`"
fi
# if not new DEVICEHUB_HOST, then check consistency
# if there is already an ID in the DLT, it should match with my internal ID
if [ ! "${EXPECTED_ID_FEDERATED}" = "${ID_FEDERATED}" ]; then
big_error "ID_FEDERATED should be ${EXPECTED_ID_FEDERATED} instead of ${ID_FEDERATED}"
fi
# not needed, but reserved
# EXPECTED_DEVICEHUB_HOST="$(curl -s "${API_RESOLVER%/}/getAll" \
# | jq -r '.url | to_entries | .[] | select(.key == "'"${ID_FEDERATED}"'") | .value' \
# | head -n 1)"
# if [ ! "${EXPECTED_DEVICEHUB_HOST}" = "${DEVICEHUB_HOST}" ]; then
# big_error "ERROR: DEVICEHUB_HOST should be ${EXPECTED_DEVICEHUB_HOST} instead of ${DEVICEHUB_HOST}"
# fi
}
config_dpp_part1() {
# 12. Add a new server to the 'api resolver'
if [ "${ID_SERVICE:-}" ]; then
handle_federated_id
else
# TODO when this runs more than one time per service, this is a problem, but for the docker-reset.sh workflow, that's fine
# TODO put this in already_configured
# TODO hardcoded http proto and port
./manage.py dlt_insert_members "http://${DOMAIN}:8000"
fi
# 13. Do a rsync api resolve
./manage.py dlt_rsync_members
# 14. Register a new user to the DLT
DATASET_FILE='/tmp/dataset.json'
cat > "${DATASET_FILE}" <<END
{
"email": "${INIT_USER}",
"password": "${INIT_PASSWD}",
"api_token": "${API_DLT_TOKEN}"
}
END
./manage.py dlt_register_user "${DATASET_FILE}"
}
config_phase() {
# TODO review this flag file
init_flagfile="${program_dir}/already_configured"
if [ ! -f "${init_flagfile}" ]; then
# non DL user (only for the inventory)
./manage.py add_institution "${INIT_ORG}"
# TODO: one error on add_user, and you don't add user anymore
./manage.py add_user "${INIT_ORG}" "${INIT_USER}" "${INIT_PASSWD}" "${ADMIN}" "${PREDEFINED_TOKEN}"
if [ "${DPP:-}" = 'true' ]; then
# 12, 13, 14
config_dpp_part1
# cleanup other spnapshots and copy dlt/dpp snapshots
# TODO make this better
rm example/snapshots/*
cp example/dpp-snapshots/*.json example/snapshots/
fi
# # 15. Add inventory snapshots for user "${INIT_USER}".
if [ "${DEMO:-}" = 'true' ]; then
/usr/bin/time ./manage.py up_snapshots example/snapshots/ "${INIT_USER}"
fi
# remain next command as the last operation for this if conditional
touch "${init_flagfile}"
fi
}
check_app_is_there() {
if [ ! -f "./manage.py" ]; then
usage
@ -156,7 +13,7 @@ check_app_is_there() {
deploy() {
# TODO this is weird, find better workaround
git config --global --add safe.directory "${program_dir}"
git config --global --add safe.directory /opt/devicehub-django
export COMMIT=$(git log --format="%H %ad" --date=iso -n 1)
if [ "${DEBUG:-}" = 'true' ]; then
@ -174,7 +31,18 @@ deploy() {
# inspired by https://medium.com/analytics-vidhya/django-with-docker-and-docker-compose-python-part-2-8415976470cc
echo "INFO detected NEW deployment"
./manage.py migrate
config_phase
INIT_ORG="${INIT_ORG:-example-org}"
INIT_USER="${INIT_USER:-user@example.org}"
INIT_PASSWD="${INIT_PASSWD:-1234}"
ADMIN='True'
PREDEFINED_TOKEN="${PREDEFINED_TOKEN:-}"
./manage.py add_institution "${INIT_ORG}"
# TODO: one error on add_user, and you don't add user anymore
./manage.py add_user "${INIT_ORG}" "${INIT_USER}" "${INIT_PASSWD}" "${ADMIN}" "${PREDEFINED_TOKEN}"
if [ "${DEMO:-}" = 'true' ]; then
./manage.py up_snapshots example/snapshots/ "${INIT_USER}"
fi
fi
}
@ -202,7 +70,6 @@ runserver() {
main() {
program_dir='/opt/devicehub-django'
cd "${program_dir}"
gen_env_vars
deploy
runserver
}

0
dpp/__init__.py
View file

3
dpp/admin.py
View file

@ -1,3 +0,0 @@
from django.contrib import admin
# Register your models here.

166
dpp/api_dlt.py
View file

@ -1,166 +0,0 @@
import json
import time
import logging
from django.conf import settings
from ereuseapi.methods import API
from dpp.models import Proof, UserDpp
logger = logging.getLogger('django')
# """The code of the status response of api dlt."""
STATUS_CODE = {
"Success": 201,
"Notwork": 400
}
ALGORITHM = "sha3-256"
PROOF_TYPE = {
'Register': 'Register',
'IssueDPP': 'IssueDPP',
'proof_of_recycling': 'proof_of_recycling',
'Erase': 'Erase',
'EWaste': 'EWaste',
}
def connect_api(user):
dp = UserDpp.objects.filter(user=user).first()
if not dp:
return
api_dlt = settings.API_DLT
token_dlt = dp.api_keys_dlt
if not api_dlt or not token_dlt:
logger.error("NOT POSSIBLE CONNECT WITH API DLT!!!")
return
return API(api_dlt, token_dlt, "ethereum")
def register_dlt(api, chid, phid, proof_type=None):
if proof_type:
return api.generate_proof(
chid,
ALGORITHM,
phid,
proof_type,
settings.ID_FEDERATED
)
return api.register_device(
chid,
ALGORITHM,
phid,
settings.ID_FEDERATED
)
def issuer_dpp_dlt(api, dpp):
phid = dpp.split(":")[1]
return api.issue_passport(
dpp,
ALGORITHM,
phid,
settings.ID_FEDERATED
)
def save_proof(signature, ev_uuid, result, proof_type, user):
if result['Status'] == STATUS_CODE.get("Success"):
timestamp = result.get('Data', {}).get('data', {}).get('timestamp')
if not timestamp:
return
logger.debug("timestamp: %s", timestamp)
d = {
"type": proof_type,
"timestamp": timestamp,
"issuer": user.institution,
"user": user,
"uuid": ev_uuid,
"signature": signature,
}
Proof.objects.create(**d)
def register_device_dlt(chid, phid, ev_uuid, user):
cny_a = 1
while cny_a:
api = connect_api(user)
if not api:
cny_a = 0
return
result = register_dlt(api, chid, phid)
try:
assert result['Status'] == STATUS_CODE.get("Success")
assert result['Data']['data']['timestamp']
cny_a = 0
except Exception:
if result.get("Data") != "Device already exists":
logger.error("API return: %s", result)
time.sleep(10)
else:
cny_a = 0
save_proof(phid, ev_uuid, result, PROOF_TYPE['Register'], user)
# TODO is neccesary?
if settings.ID_FEDERATED:
cny = 1
while cny:
try:
api.add_service(
chid,
'DeviceHub',
settings.ID_FEDERATED,
'Inventory service',
'Inv',
)
cny = 0
except Exception:
time.sleep(10)
def register_passport_dlt(chid, phid, ev_uuid, user):
token_dlt = settings.TOKEN_DLT
api_dlt = settings.API_DLT
if not token_dlt or not api_dlt:
return
dpp = "{chid}:{phid}".format(chid=chid, phid=phid)
if Proof.objects.filter(signature=dpp, type=PROOF_TYPE['IssueDPP']).exists():
return
cny_a = 1
while cny_a:
try:
api = connect_api(user)
if not api:
cny_a = 0
return
result = issuer_dpp_dlt(api, dpp)
cny_a = 0
except Exception as err:
logger.error("ERROR API issue passport return: %s", err)
time.sleep(10)
if result['Status'] is not STATUS_CODE.get("Success"):
logger.error("ERROR API issue passport return: %s", result)
return
save_proof(phid, ev_uuid, result, PROOF_TYPE['IssueDPP'], user)

6
dpp/apps.py
View file

@ -1,6 +0,0 @@
from django.apps import AppConfig
class DppConfig(AppConfig):
default_auto_field = "django.db.models.BigAutoField"
name = "dpp"

35
dpp/management/commands/dlt_insert_members.py
View file

@ -1,35 +0,0 @@
import logging
import requests
from django.core.management.base import BaseCommand
from django.conf import settings
from user.models import Institution
logger = logging.getLogger('django')
class Command(BaseCommand):
help = "Insert a new Institution in DLT"
def add_arguments(self, parser):
parser.add_argument('domain', type=str, help='institution')
def handle(self, *args, **kwargs):
domain = kwargs.get("domain")
api = settings.API_RESOLVER
if not api:
logger.error("you need set the var API_RESOLVER")
return
if "http" not in domain:
logger.error("you need put https:// in %s", domain)
return
api = api.strip("/")
domain = domain.strip("/")
data = {"url": domain}
url = api + '/registerURL'
res = requests.post(url, json=data)
print(res.json())

72
dpp/management/commands/dlt_register_user.py
View file

@ -1,72 +0,0 @@
import json
import logging
from ereuseapi.methods import API
from django.conf import settings
from django.core.management.base import BaseCommand
from user.models import User, Institution
from dpp.models import UserDpp
logger = logging.getLogger('django')
class Command(BaseCommand):
help = "Insert users than are in Dlt with params: path of data set file"
def add_arguments(self, parser):
parser.add_argument('dataset_file', type=str, help='institution')
def handle(self, *args, **kwargs):
dataset_file = kwargs.get("dataset_file")
self.api_dlt = settings.API_DLT
self.institution = Institution.objects.filter().first()
if not self.api_dlt:
logger.error("you need set the var API_DLT")
return
self.api_dlt = self.api_dlt.strip("/")
with open(dataset_file) as f:
dataset = json.loads(f.read())
self.add_user(dataset)
def add_user(self, data):
email = data.get("email")
password = data.get("password")
api_token = data.get("api_token")
# ethereum = {"data": {"api_token": api_token}}
# data_eth = json.dumps(ethereum)
data_eth = json.dumps(api_token)
# TODO encrypt in the future
# api_keys_dlt = encrypt(password, data_eth)
api_keys_dlt = data_eth.strip('"').strip("'")
user = User.objects.filter(email=email).first()
if not user:
user = User.objects.create(
email=email,
password=password,
institution = self.institution
)
roles = []
token_dlt = api_token
api = API(self.api_dlt, token_dlt, "ethereum")
result = api.check_user_roles()
if result.get('Status') == 200:
if 'Success' in result.get('Data', {}).get('status'):
rols = result.get('Data', {}).get('data', {})
roles = [(k, k) for k, v in rols.items() if v]
roles_dlt = json.dumps(roles)
UserDpp.objects.create(
roles_dlt=roles_dlt,
api_keys_dlt=api_keys_dlt,
user=user
)

47
dpp/management/commands/dlt_rsync_members.py
View file

@ -1,47 +0,0 @@
import logging
import requests
from django.core.management.base import BaseCommand
from django.conf import settings
from dpp.models import MemberFederated
logger = logging.getLogger('django')
class Command(BaseCommand):
help = "Synchronize members of DLT"
def handle(self, *args, **kwargs):
api = settings.API_RESOLVER
if not api:
logger.error("you need set the var API_RESOLVER")
return
api = api.strip("/")
url = api + '/getAll'
res = requests.get(url)
if res.status_code != 200:
return "Error, {}".format(res.text)
response = res.json()
members = response['url']
counter = members.pop('counter')
if counter <= MemberFederated.objects.count():
logger.info("Synchronize members of DLT -> All Ok")
return "All ok"
for k, v in members.items():
id = self.clean_id(k)
member = MemberFederated.objects.filter(dlt_id_provider=id).first()
if member:
if member.domain != v:
member.domain = v
member.save()
continue
MemberFederated.objects.create(dlt_id_provider=id, domain=v)
return res.text
def clean_id(self, id):
return int(id.split('DH')[-1])

52
dpp/migrations/0001_initial.py
View file

@ -1,52 +0,0 @@
# Generated by Django 5.0.6 on 2024-11-18 14:29
import django.db.models.deletion
from django.conf import settings
from django.db import migrations, models
class Migration(migrations.Migration):
initial = True
dependencies = [
("user", "0001_initial"),
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]
operations = [
migrations.CreateModel(
name="Proof",
fields=[
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("timestamp", models.IntegerField()),
("uuid", models.UUIDField()),
("signature", models.CharField(max_length=256)),
("type", models.CharField(max_length=256)),
(
"issuer",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
to="user.institution",
),
),
(
"user",
models.ForeignKey(
blank=True,
null=True,
on_delete=django.db.models.deletion.SET_NULL,
to=settings.AUTH_USER_MODEL,
),
),
],
),
]

25
dpp/migrations/0002_memberfederated.py
View file

@ -1,25 +0,0 @@
# Generated by Django 5.0.6 on 2024-11-19 19:18
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("dpp", "0001_initial"),
]
operations = [
migrations.CreateModel(
name="MemberFederated",
fields=[
(
"dlt_id_provider",
models.IntegerField(primary_key=True, serialize=False),
),
("domain", models.CharField(max_length=256)),
("client_id", models.CharField(max_length=256)),
("client_secret", models.CharField(max_length=256)),
],
),
]

60
dpp/migrations/0003_memberfederated_institution_and_more.py
View file

@ -1,60 +0,0 @@
# Generated by Django 5.0.6 on 2024-11-20 10:51
import django.db.models.deletion
from django.conf import settings
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("dpp", "0002_memberfederated"),
("user", "0001_initial"),
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]
operations = [
migrations.AddField(
model_name="memberfederated",
name="institution",
field=models.ForeignKey(
blank=True,
null=True,
on_delete=django.db.models.deletion.SET_NULL,
to="user.institution",
),
),
migrations.AlterField(
model_name="memberfederated",
name="client_id",
field=models.CharField(max_length=256, null=True),
),
migrations.AlterField(
model_name="memberfederated",
name="client_secret",
field=models.CharField(max_length=256, null=True),
),
migrations.CreateModel(
name="UserDpp",
fields=[
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("roles_dlt", models.TextField()),
("api_keys_dlt", models.TextField()),
(
"user",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
to=settings.AUTH_USER_MODEL,
),
),
],
),
]

0
dpp/migrations/__init__.py
View file

32
dpp/models.py
View file

@ -1,32 +0,0 @@
from django.db import models
from user.models import User, Institution
from utils.constants import STR_EXTEND_SIZE
# Create your models here.
class Proof(models.Model):
## The signature can be a phid or dpp depending of type of Proof
timestamp = models.IntegerField()
uuid = models.UUIDField()
signature = models.CharField(max_length=STR_EXTEND_SIZE)
type = models.CharField(max_length=STR_EXTEND_SIZE)
issuer = models.ForeignKey(Institution, on_delete=models.CASCADE)
user = models.ForeignKey(
User, on_delete=models.SET_NULL, null=True, blank=True)
class MemberFederated(models.Model):
dlt_id_provider = models.IntegerField(primary_key=True)
domain = models.CharField(max_length=STR_EXTEND_SIZE)
# This client_id and client_secret is used for connected to this domain as
# a client and this domain then is the server of auth
client_id = models.CharField(max_length=STR_EXTEND_SIZE, null=True)
client_secret = models.CharField(max_length=STR_EXTEND_SIZE, null=True)
institution = models.ForeignKey(
Institution, on_delete=models.SET_NULL, null=True, blank=True)
class UserDpp(models.Model):
roles_dlt = models.TextField()
api_keys_dlt = models.TextField()
user = models.ForeignKey(User, on_delete=models.CASCADE)

3
dpp/tests.py
View file

@ -1,3 +0,0 @@
from django.test import TestCase
# Create your tests here.

8
dpp/urls.py
View file

@ -1,8 +0,0 @@
from django.urls import path
from dpp import views
app_name = 'dpp'
urlpatterns = [
path("<int:proof_id>/", views.ProofView.as_view(), name="proof"),
]

40
dpp/views.py
View file

@ -1,40 +0,0 @@
import json
import logging
import hashlib
from django.views.generic.edit import View
from django.http import JsonResponse
from dpp.api_dlt import ALGORITHM
from evidence.models import Evidence
from evidence.parse import Build
from dpp.models import Proof
class ProofView(View):
def get(self, request, *args, **kwargs):
timestamp = kwargs.get("proof_id")
proof = Proof.objects.filter(timestamp=timestamp).first()
if not proof:
return JsonResponse({}, status=404)
ev = Evidence(proof.uuid)
if not ev.doc:
return JsonResponse({}, status=404)
dev = Build(ev.doc, None, check=True)
doc = dev.get_phid()
data = {
"algorithm": ALGORITHM,
"document": json.dumps(doc)
}
d = {
'@context': ['https://ereuse.org/proof0.json'],
'data': data,
}
response = JsonResponse(d, status=200)
response["Access-Control-Allow-Origin"] = "*"
return response

12
evidence/forms.py
View file

@ -29,17 +29,17 @@ class UploadForm(forms.Form):
try:
file_json = json.loads(file_data)
snap = Build(file_json, None, check=True)
Build(file_json, None, check=True)
exist_annotation = Annotation.objects.filter(
uuid=snap.uuid
uuid=file_json['uuid']
).first()
if exist_annotation:
raise ValidationError(
raise ValidationError(
_("The snapshot already exists"),
code="duplicate_snapshot",
)
#Catch any error and display it as Validation Error so the Form handles it
except Exception as e:
raise ValidationError(
@ -221,7 +221,7 @@ class EraseServerForm(forms.Form):
if self.instance:
return
Annotation.objects.create(
uuid=self.uuid,
type=Annotation.Type.ERASE_SERVER,

64
evidence/models.py
View file

@ -1,12 +1,11 @@
import json
import hashlib
from dmidecode import DMIParse
from django.db import models
from utils.constants import STR_EXTEND_SIZE, CHASSIS_DH
from evidence.xapian import search
from evidence.parse_details import ParseSnapshot, get_inxi, get_inxi_key
from evidence.parse_details import ParseSnapshot
from user.models import User, Institution
@ -40,7 +39,6 @@ class Evidence:
self.doc = None
self.created = None
self.dmi = None
self.inxi = None
self.annotations = []
self.components = []
self.default = "n/a"
@ -60,19 +58,10 @@ class Evidence:
if a:
self.owner = a.owner
def get_phid(self):
if not self.doc:
self.get_doc()
return hashlib.sha3_256(json.dumps(self.doc)).hexdigest()
def get_doc(self):
self.doc = {}
self.inxi = None
if not self.owner:
self.get_owner()
qry = 'uuid:"{}"'.format(self.uuid)
matches = search(self.owner, qry, limit=1)
if matches and matches.size() < 0:
@ -81,36 +70,9 @@ class Evidence:
for xa in matches:
self.doc = json.loads(xa.document.get_data())
if self.is_legacy():
return
if self.doc.get("credentialSubject"):
for ev in self.doc["evidence"]:
if "dmidecode" == ev.get("operation"):
dmidecode_raw = ev["output"]
if "inxi" == ev.get("operation"):
self.inxi = ev["output"]
else:
if not self.is_legacy():
dmidecode_raw = self.doc["data"]["dmidecode"]
inxi_raw = self.doc["data"]["inxi"]
self.dmi = DMIParse(dmidecode_raw)
try:
self.inxi = json.loads(inxi_raw)
except Exception:
pass
if self.inxi:
try:
machine = get_inxi_key(self.inxi, 'Machine')
for m in machine:
system = get_inxi(m, "System")
if system:
self.device_manufacturer = system
self.device_model = get_inxi(m, "product")
self.device_serial_number = get_inxi(m, "serial")
self.device_chassis = get_inxi(m, "Type")
self.device_version = get_inxi(m, "v")
except Exception:
return
def get_time(self):
if not self.doc:
@ -136,9 +98,6 @@ class Evidence:
if self.is_legacy():
return self.doc['device']['manufacturer']
if self.inxi:
return self.device_manufacturer
return self.dmi.manufacturer().strip()
def get_model(self):
@ -151,18 +110,12 @@ class Evidence:
if self.is_legacy():
return self.doc['device']['model']
if self.inxi:
return self.device_model
return self.dmi.model().strip()
def get_chassis(self):
if self.is_legacy():
return self.doc['device']['model']
if self.inxi:
return self.device_chassis
chassis = self.dmi.get("Chassis")[0].get("Type", '_virtual')
lower_type = chassis.lower()
@ -174,18 +127,8 @@ class Evidence:
def get_serial_number(self):
if self.is_legacy():
return self.doc['device']['serialNumber']
if self.inxi:
return self.device_serial_number
return self.dmi.serial_number().strip()
def get_version(self):
if self.inxi:
return self.device_version
return ""
@classmethod
def get_all(cls, user):
return Annotation.objects.filter(
@ -199,9 +142,6 @@ class Evidence:
self.components = snapshot['components']
def is_legacy(self):
if self.doc.get("credentialSubject"):
return False
return self.doc.get("software") != "workbench-script"
def is_web_snapshot(self):

152
evidence/parse.py
View file

@ -3,48 +3,43 @@ import hashlib
import logging
from dmidecode import DMIParse
from evidence.parse_details import ParseSnapshot
from json_repair import repair_json
from evidence.parse_details import get_lshw_child
from evidence.models import Annotation
from evidence.xapian import index
from evidence.parse_details import get_inxi_key, get_inxi
from django.conf import settings
from utils.constants import CHASSIS_DH
if settings.DPP:
from dpp.api_dlt import register_device_dlt, register_passport_dlt
logger = logging.getLogger('django')
def get_mac(lshw):
try:
if type(lshw) is dict:
hw = lshw
else:
hw = json.loads(lshw)
except json.decoder.JSONDecodeError:
hw = json.loads(repair_json(lshw))
def get_mac(inxi):
nets = get_inxi_key(inxi, "Network")
networks = [(nets[i], nets[i + 1]) for i in range(0, len(nets) - 1, 2)]
nets = []
get_lshw_child(hw, nets, 'network')
nets_sorted = sorted(nets, key=lambda x: x['businfo'])
if nets_sorted:
mac = nets_sorted[0]['serial']
logger.debug("The snapshot has the following MAC: %s" , mac)
return mac
for n, iface in networks:
if get_inxi(n, "port"):
return get_inxi(iface, 'mac')
class Build:
def __init__(self, evidence_json, user, check=False):
self.evidence = evidence_json.copy()
self.json = evidence_json.copy()
if evidence_json.get("credentialSubject"):
self.json.update(evidence_json["credentialSubject"])
if evidence_json.get("evidence"):
self.json["data"] = {}
for ev in evidence_json["evidence"]:
k = ev.get("operation")
if not k:
continue
self.json["data"][k] = ev.get("output")
self.json = evidence_json
self.uuid = self.json['uuid']
self.user = user
self.hid = None
self.chid = None
self.phid = self.get_signature(self.json)
self.generate_chids()
if check:
@ -52,17 +47,14 @@ class Build:
self.index()
self.create_annotations()
if settings.DPP:
self.register_device_dlt()
def index(self):
snap = json.dumps(self.evidence)
snap = json.dumps(self.json)
index(self.user.institution, self.uuid, snap)
def generate_chids(self):
self.algorithms = {
'hidalgo1': self.get_hid_14(),
'legacy_dpp': self.get_chid_dpp(),
}
def get_hid_14(self):
@ -77,51 +69,8 @@ class Build:
sku = device.get("sku", '')
hid = f"{manufacturer}{model}{chassis}{serial_number}{sku}"
self.chid = hashlib.sha3_256(hid.encode()).hexdigest()
return self.chid
def get_chid_dpp(self):
if self.json.get("software") == "workbench-script":
device = ParseSnapshot(self.json).device
else:
device = self.json['device']
hid = self.get_id_hw_dpp(device)
self.chid = hashlib.sha3_256(hid.encode("utf-8")).hexdigest()
return self.chid
def get_id_hw_dpp(self, d):
manufacturer = d.get("manufacturer", '')
model = d.get("model", '')
chassis = d.get("chassis", '')
serial_number = d.get("serialNumber", '')
sku = d.get("sku", '')
typ = d.get("type", '')
version = d.get("version", '')
return f"{manufacturer}{model}{chassis}{serial_number}{sku}{typ}{version}"
def get_phid(self):
if self.json.get("software") == "workbench-script":
data = ParseSnapshot(self.json)
self.device = data.device
self.components = data.components
else:
self.device = self.json.get("device")
self.components = self.json.get("components", [])
self.device.pop("actions", None)
for c in self.components:
c.pop("actions", None)
device = self.get_id_hw_dpp(self.device)
components = sorted(self.components, key=lambda x: x.get("type"))
doc = [("computer", device)]
for c in components:
doc.append((c.get("type"), self.get_id_hw_dpp(c)))
return doc
return hashlib.sha3_256(hid.encode()).hexdigest()
def create_annotations(self):
annotation = Annotation.objects.filter(
@ -145,39 +94,38 @@ class Build:
value=v
)
def get_chassis_dh(self):
chassis = self.get_chassis()
lower_type = chassis.lower()
for k, v in CHASSIS_DH.items():
if lower_type in v:
return k
return self.default
def get_sku(self):
return self.dmi.get("System")[0].get("SKU Number", "n/a").strip()
def get_chassis(self):
return self.dmi.get("Chassis")[0].get("Type", '_virtual')
def get_hid(self, snapshot):
try:
self.inxi = self.json["data"]["inxi"]
if isinstance(self.inxi, str):
self.inxi = json.loads(self.inxi)
except Exception:
logger.error("No inxi in snapshot %s", self.uuid)
return ""
dmidecode_raw = snapshot["data"]["dmidecode"]
self.dmi = DMIParse(dmidecode_raw)
machine = get_inxi_key(self.inxi, 'Machine')
for m in machine:
system = get_inxi(m, "System")
if system:
manufacturer = system
model = get_inxi(m, "product")
serial_number = get_inxi(m, "serial")
chassis = get_inxi(m, "Type")
else:
sku = get_inxi(m, "part-nu")
manufacturer = self.dmi.manufacturer().strip()
model = self.dmi.model().strip()
chassis = self.get_chassis_dh()
serial_number = self.dmi.serial_number()
sku = self.get_sku()
mac = get_mac(self.inxi) or ""
if not snapshot["data"].get('lshw'):
return f"{manufacturer}{model}{chassis}{serial_number}{sku}"
lshw = snapshot["data"]["lshw"]
# mac = get_mac2(hwinfo_raw) or ""
mac = get_mac(lshw) or ""
if not mac:
txt = "Could not retrieve MAC address in snapshot %s"
logger.warning(txt, snapshot['uuid'])
return f"{manufacturer}{model}{chassis}{serial_number}{sku}"
return f"{manufacturer}{model}{chassis}{serial_number}{sku}{mac}"
def get_signature(self, doc):
return hashlib.sha3_256(json.dumps(doc).encode()).hexdigest()
def register_device_dlt(self):
chid = self.algorithms.get('legacy_dpp')
phid = self.get_signature(self.get_phid())
register_device_dlt(chid, phid, self.uuid, self.user)
register_passport_dlt(chid, phid, self.uuid, self.user)

644
evidence/parse_details.py
View file

@ -1,10 +1,10 @@
import re
import json
import logging
import numpy as np
from datetime import datetime
from dmidecode import DMIParse
from json_repair import repair_json
from utils.constants import CHASSIS_DH, DATASTORAGEINTERFACE
@ -12,345 +12,322 @@ from utils.constants import CHASSIS_DH, DATASTORAGEINTERFACE
logger = logging.getLogger('django')
def get_inxi_key(inxi, component):
for n in inxi:
for k, v in n.items():
if component in k:
return v
def get_inxi(n, name):
for k, v in n.items():
if f"#{name}" in k:
return v
return ""
def get_lshw_child(child, nets, component):
if child.get('id') == component:
nets.append(child)
if child.get('children'):
[get_lshw_child(x, nets, component) for x in child['children']]
class ParseSnapshot:
def __init__(self, snapshot, default="n/a"):
self.default = default
self.dmidecode_raw = snapshot.get("data", {}).get("dmidecode", "{}")
self.smart_raw = snapshot.get("data", {}).get("smartctl", [])
self.inxi_raw = snapshot.get("data", {}).get("inxi", "") or ""
for ev in snapshot.get("evidence", []):
if "dmidecode" == ev.get("operation"):
self.dmidecode_raw = ev["output"]
if "inxi" == ev.get("operation"):
self.inxi_raw = ev["output"]
if "smartctl" == ev.get("operation"):
self.smart_raw = ev["output"]
data = snapshot
if snapshot.get("credentialSubject"):
data = snapshot["credentialSubject"]
self.dmidecode_raw = snapshot["data"].get("dmidecode", "{}")
self.smart_raw = snapshot["data"].get("disks", [])
self.hwinfo_raw = snapshot["data"].get("hwinfo", "")
self.lshw_raw = snapshot["data"].get("lshw", {}) or {}
self.lscpi_raw = snapshot["data"].get("lspci", "")
self.device = {"actions": []}
self.components = []
self.monitors = []
self.dmi = DMIParse(self.dmidecode_raw)
self.smart = self.loads(self.smart_raw)
self.inxi = self.loads(self.inxi_raw)
self.lshw = self.loads(self.lshw_raw)
self.hwinfo = self.parse_hwinfo()
self.set_computer()
self.get_hwinfo_monitors()
self.set_components()
self.snapshot_json = {
"type": "Snapshot",
"device": self.device,
"software": data["software"],
"software": snapshot["software"],
"components": self.components,
"uuid": data['uuid'],
"endTime": data["timestamp"],
"uuid": snapshot['uuid'],
"version": snapshot['version'],
"endTime": snapshot["timestamp"],
"elapsed": 1,
}
def set_computer(self):
machine = get_inxi_key(self.inxi, 'Machine') or []
for m in machine:
system = get_inxi(m, "System")
if system:
self.device['manufacturer'] = system
self.device['model'] = get_inxi(m, "product")
self.device['serialNumber'] = get_inxi(m, "serial")
self.device['type'] = get_inxi(m, "Type")
self.device['chassis'] = self.device['type']
self.device['version'] = get_inxi(m, "v")
else:
self.device['system_uuid'] = get_inxi(m, "uuid")
self.device['sku'] = get_inxi(m, "part-nu")
self.device['manufacturer'] = self.dmi.manufacturer().strip()
self.device['model'] = self.dmi.model().strip()
self.device['serialNumber'] = self.dmi.serial_number()
self.device['type'] = self.get_type()
self.device['sku'] = self.get_sku()
self.device['version'] = self.get_version()
self.device['system_uuid'] = self.get_uuid()
self.device['family'] = self.get_family()
self.device['chassis'] = self.get_chassis_dh()
def set_components(self):
self.get_mother_board()
self.get_cpu()
self.get_ram()
self.get_mother_board()
self.get_graphic()
self.get_display()
self.get_networks()
self.get_sound_card()
self.get_data_storage()
self.get_battery()
def get_mother_board(self):
machine = get_inxi_key(self.inxi, 'Machine') or []
mb = {"type": "Motherboard",}
for m in machine:
bios_date = get_inxi(m, "date")
if not bios_date:
continue
mb["manufacturer"] = get_inxi(m, "Mobo")
mb["model"] = get_inxi(m, "model")
mb["serialNumber"] = get_inxi(m, "serial")
mb["version"] = get_inxi(m, "v")
mb["biosDate"] = bios_date
mb["biosVersion"] = self.get_bios_version()
mb["firewire"]: self.get_firmware_num()
mb["pcmcia"]: self.get_pcmcia_num()
mb["serial"]: self.get_serial_num()
mb["usb"]: self.get_usb_num()
self.get_ram_slots(mb)
self.components.append(mb)
def get_ram_slots(self, mb):
memory = get_inxi_key(self.inxi, 'Memory') or []
for m in memory:
slots = get_inxi(m, "slots")
if not slots:
continue
mb["slots"] = slots
mb["ramSlots"] = get_inxi(m, "modules")
mb["ramMaxSize"] = get_inxi(m, "capacity")
self.get_display()
self.get_sound_card()
self.get_networks()
def get_cpu(self):
cpu = get_inxi_key(self.inxi, 'CPU') or []
cp = {"type": "Processor"}
vulnerabilities = []
for c in cpu:
base = get_inxi(c, "model")
if base:
cp["model"] = get_inxi(c, "model")
cp["arch"] = get_inxi(c, "arch")
cp["bits"] = get_inxi(c, "bits")
cp["gen"] = get_inxi(c, "gen")
cp["family"] = get_inxi(c, "family")
cp["date"] = get_inxi(c, "built")
continue
des = get_inxi(c, "L1")
if des:
cp["L1"] = des
cp["L2"] = get_inxi(c, "L2")
cp["L3"] = get_inxi(c, "L3")
cp["cpus"] = get_inxi(c, "cpus")
cp["cores"] = get_inxi(c, "cores")
cp["threads"] = get_inxi(c, "threads")
continue
bogo = get_inxi(c, "bogomips")
if bogo:
cp["bogomips"] = bogo
cp["base/boost"] = get_inxi(c, "base/boost")
cp["min/max"] = get_inxi(c, "min/max")
cp["ext-clock"] = get_inxi(c, "ext-clock")
cp["volts"] = get_inxi(c, "volts")
continue
ctype = get_inxi(c, "Type")
if ctype:
v = {"Type": ctype}
status = get_inxi(c, "status")
if status:
v["status"] = status
mitigation = get_inxi(c, "mitigation")
if mitigation:
v["mitigation"] = mitigation
vulnerabilities.append(v)
self.components.append(cp)
def get_ram(self):
memory = get_inxi_key(self.inxi, 'Memory') or []
mem = {"type": "RamModule"}
for m in memory:
base = get_inxi(m, "System RAM")
if base:
mem["size"] = get_inxi(m, "total")
slot = get_inxi(m, "manufacturer")
if slot:
mem["manufacturer"] = slot
mem["model"] = get_inxi(m, "part-no")
mem["serialNumber"] = get_inxi(m, "serial")
mem["speed"] = get_inxi(m, "speed")
mem["bits"] = get_inxi(m, "data")
mem["interface"] = get_inxi(m, "type")
module = get_inxi(m, "modules")
if module:
mem["modules"] = module
self.components.append(mem)
def get_graphic(self):
graphics = get_inxi_key(self.inxi, 'Graphics') or []
for c in graphics:
if not get_inxi(c, "Device") or not get_inxi(c, "vendor"):
continue
for cpu in self.dmi.get('Processor'):
serial = cpu.get('Serial Number')
if serial == 'Not Specified' or not serial:
serial = cpu.get('ID').replace(' ', '')
self.components.append(
{
"type": "GraphicCard",
"memory": self.get_memory_video(c),
"manufacturer": get_inxi(c, "vendor"),
"model": get_inxi(c, "Device"),
"arch": get_inxi(c, "arch"),
"serialNumber": get_inxi(c, "serial"),
"integrated": True if get_inxi(c, "port") else False
"actions": [],
"type": "Processor",
"speed": self.get_cpu_speed(cpu),
"cores": int(cpu.get('Core Count', 1)),
"model": cpu.get('Version'),
"threads": int(cpu.get('Thread Count', 1)),
"manufacturer": cpu.get('Manufacturer'),
"serialNumber": serial,
"brand": cpu.get('Family'),
"address": self.get_cpu_address(cpu),
"bogomips": self.get_bogomips(),
}
)
def get_battery(self):
bats = get_inxi_key(self.inxi, 'Battery') or []
for b in bats:
def get_ram(self):
for ram in self.dmi.get("Memory Device"):
if ram.get('size') == 'No Module Installed':
continue
if not ram.get("Speed"):
continue
self.components.append(
{
"type": "Battery",
"model": get_inxi(b, "model"),
"serialNumber": get_inxi(b, "serial"),
"condition": get_inxi(b, "condition"),
"cycles": get_inxi(b, "cycles"),
"volts": get_inxi(b, "volts")
"actions": [],
"type": "RamModule",
"size": self.get_ram_size(ram),
"speed": self.get_ram_speed(ram),
"manufacturer": ram.get("Manufacturer", self.default),
"serialNumber": ram.get("Serial Number", self.default),
"interface": ram.get("Type", "DDR"),
"format": ram.get("Form Factor", "DIMM"),
"model": ram.get("Part Number", self.default),
}
)
def get_mother_board(self):
for moder_board in self.dmi.get("Baseboard"):
self.components.append(
{
"actions": [],
"type": "Motherboard",
"version": moder_board.get("Version"),
"serialNumber": moder_board.get("Serial Number", "").strip(),
"manufacturer": moder_board.get("Manufacturer", "").strip(),
"biosDate": self.get_bios_date(),
"ramMaxSize": self.get_max_ram_size(),
"ramSlots": len(self.dmi.get("Memory Device")),
"slots": self.get_ram_slots(),
"model": moder_board.get("Product Name", "").strip(),
"firewire": self.get_firmware_num(),
"pcmcia": self.get_pcmcia_num(),
"serial": self.get_serial_num(),
"usb": self.get_usb_num(),
}
)
def get_graphic(self):
displays = []
get_lshw_child(self.lshw, displays, 'display')
for c in displays:
if not c['configuration'].get('driver', None):
continue
self.components.append(
{
"actions": [],
"type": "GraphicCard",
"memory": self.get_memory_video(c),
"manufacturer": c.get("vendor", self.default),
"model": c.get("product", self.default),
"serialNumber": c.get("serial", self.default),
}
)
def get_memory_video(self, c):
memory = get_inxi_key(self.inxi, 'Memory') or []
for m in memory:
igpu = get_inxi(m, "igpu")
agpu = get_inxi(m, "agpu")
ngpu = get_inxi(m, "ngpu")
gpu = get_inxi(m, "gpu")
if igpu or agpu or gpu or ngpu:
return igpu or agpu or gpu or ngpu
return self.default
# get info of lspci
# pci_id = c['businfo'].split('@')[1]
# lspci.get(pci_id) | grep size
# lspci -v -s 00:02.0
return None
def get_data_storage(self):
hdds= get_inxi_key(self.inxi, 'Drives') or []
for d in hdds:
usb = get_inxi(d, "type")
if usb == "USB":
for sm in self.smart:
if sm.get('smartctl', {}).get('exit_status') == 1:
continue
model = sm.get('model_name')
manufacturer = None
hours = sm.get("power_on_time", {}).get("hours", 0)
if model and len(model.split(" ")) > 1:
mm = model.split(" ")
model = mm[-1]
manufacturer = " ".join(mm[:-1])
serial = get_inxi(d, "serial")
if serial:
hd = {
"type": "Storage",
"manufacturer": get_inxi(d, "vendor"),
"model": get_inxi(d, "model"),
"serialNumber": get_inxi(d, "serial"),
"size": get_inxi(d, "size"),
"speed": get_inxi(d, "speed"),
"interface": get_inxi(d, "tech"),
"firmware": get_inxi(d, "fw-rev")
self.components.append(
{
"actions": self.sanitize(sm),
"type": self.get_data_storage_type(sm),
"model": model,
"manufacturer": manufacturer,
"serialNumber": sm.get('serial_number'),
"size": self.get_data_storage_size(sm),
"variant": sm.get("firmware_version"),
"interface": self.get_data_storage_interface(sm),
"hours": hours,
}
rpm = get_inxi(d, "rpm")
if rpm:
hd["rpm"] = rpm
family = get_inxi(d, "family")
if family:
hd["family"] = family
sata = get_inxi(d, "sata")
if sata:
hd["sata"] = sata
continue
cycles = get_inxi(d, "cycles")
if cycles:
hd['cycles'] = cycles
hd["health"] = get_inxi(d, "health")
hd["time of used"] = get_inxi(d, "on")
hd["read used"] = get_inxi(d, "read-units")
hd["written used"] = get_inxi(d, "written-units")
self.components.append(hd)
continue
hd = {}
)
def sanitize(self, action):
return []
def get_bogomips(self):
if not self.hwinfo:
return self.default
bogomips = 0
for row in self.hwinfo:
for cel in row:
if 'BogoMips' in cel:
try:
bogomips += float(cel.split(":")[-1])
except:
pass
return bogomips
def get_networks(self):
nets = get_inxi_key(self.inxi, "Network") or []
networks = [(nets[i], nets[i + 1]) for i in range(0, len(nets) - 1, 2)]
for n, iface in networks:
model = get_inxi(n, "Device")
if not model:
continue
interface = ''
for k in n.keys():
if "port" in k:
interface = "Integrated"
if "pcie" in k:
interface = "PciExpress"
if get_inxi(n, "type") == "USB":
interface = "USB"
networks = []
get_lshw_child(self.lshw, networks, 'network')
for c in networks:
capacity = c.get('capacity')
wireless = bool(c.get('configuration', {}).get('wireless', False))
self.components.append(
{
"actions": [],
"type": "NetworkAdapter",
"model": model,
"manufacturer": get_inxi(n, 'vendor'),
"serialNumber": get_inxi(iface, 'mac'),
"speed": get_inxi(n, "speed"),
"interface": interface,
"model": c.get('product'),
"manufacturer": c.get('vendor'),
"serialNumber": c.get('serial'),
"speed": capacity,
"variant": c.get('version', 1),
"wireless": wireless or False,
"integrated": "PCI:0000:00" in c.get("businfo", ""),
}
)
def get_sound_card(self):
audio = get_inxi_key(self.inxi, "Audio") or []
for c in audio:
model = get_inxi(c, "Device")
if not model:
continue
multimedias = []
get_lshw_child(self.lshw, multimedias, 'multimedia')
for c in multimedias:
self.components.append(
{
"actions": [],
"type": "SoundCard",
"model": model,
"manufacturer": get_inxi(c, 'vendor'),
"serialNumber": get_inxi(c, 'serial'),
"model": c.get('product'),
"manufacturer": c.get('vendor'),
"serialNumber": c.get('serial'),
}
)
def get_display(self):
graphics = get_inxi_key(self.inxi, "Graphics") or []
for c in graphics:
if not get_inxi(c, "Monitor"):
continue
def get_display(self): # noqa: C901
TECHS = 'CRT', 'TFT', 'LED', 'PDP', 'LCD', 'OLED', 'AMOLED'
for c in self.monitors:
resolution_width, resolution_height = (None,) * 2
refresh, serial, model, manufacturer, size = (None,) * 5
year, week, production_date = (None,) * 3
for x in c:
if "Vendor: " in x:
manufacturer = x.split('Vendor: ')[-1].strip()
if "Model: " in x:
model = x.split('Model: ')[-1].strip()
if "Serial ID: " in x:
serial = x.split('Serial ID: ')[-1].strip()
if " Resolution: " in x:
rs = x.split(' Resolution: ')[-1].strip()
if 'x' in rs:
resolution_width, resolution_height = [
int(r) for r in rs.split('x')
]
if "Frequencies: " in x:
try:
refresh = int(float(x.split(',')[-1].strip()[:-3]))
except Exception:
pass
if 'Year of Manufacture' in x:
year = x.split(': ')[1]
if 'Week of Manufacture' in x:
week = x.split(': ')[1]
if "Size: " in x:
size = self.get_size_monitor(x)
technology = next((t for t in TECHS if t in c[0]), None)
if year and week:
d = '{} {} 0'.format(year, week)
production_date = datetime.strptime(d, '%Y %W %w').isoformat()
self.components.append(
{
"actions": [],
"type": "Display",
"model": get_inxi(c, "model"),
"manufacturer": get_inxi(c, "vendor"),
"serialNumber": get_inxi(c, "serial"),
'size': get_inxi(c, "size"),
'diagonal': get_inxi(c, "diag"),
'resolution': get_inxi(c, "res"),
"date": get_inxi(c, "built"),
'ratio': get_inxi(c, "ratio"),
"model": model,
"manufacturer": manufacturer,
"serialNumber": serial,
'size': size,
'resolutionWidth': resolution_width,
'resolutionHeight': resolution_height,
"productionDate": production_date,
'technology': technology,
'refreshRate': refresh,
}
)
def get_hwinfo_monitors(self):
for c in self.hwinfo:
monitor = None
external = None
for x in c:
if 'Hardware Class: monitor' in x:
monitor = c
if 'Driver Info' in x:
external = c
if monitor and not external:
self.monitors.append(c)
def get_size_monitor(self, x):
i = 1 / 25.4
t = x.split('Size: ')[-1].strip()
tt = t.split('mm')
if not tt:
return 0
sizes = tt[0].strip()
if 'x' not in sizes:
return 0
w, h = [int(x) for x in sizes.split('x')]
return "{:.2f}".format(np.sqrt(w**2 + h**2) * i)
def get_cpu_address(self, cpu):
default = 64
for ch in self.lshw.get('children', []):
for c in ch.get('children', []):
if c['class'] == 'processor':
return c.get('width', default)
return default
def get_usb_num(self):
return len(
[
@ -387,13 +364,133 @@ class ParseSnapshot:
]
)
def get_bios_version(self):
return self.dmi.get("BIOS")[0].get("BIOS Revision", '1')
def get_bios_date(self):
return self.dmi.get("BIOS")[0].get("Release Date", self.default)
def get_firmware(self):
return self.dmi.get("BIOS")[0].get("Firmware Revision", '1')
def get_max_ram_size(self):
size = 0
for slot in self.dmi.get("Physical Memory Array"):
capacity = slot.get("Maximum Capacity", '0').split(" ")[0]
size += int(capacity)
return size
def get_ram_slots(self):
slots = 0
for x in self.dmi.get("Physical Memory Array"):
slots += int(x.get("Number Of Devices", 0))
return slots
def get_ram_size(self, ram):
memory = ram.get("Size", "0")
return memory
def get_ram_speed(self, ram):
size = ram.get("Speed", "0")
return size
def get_cpu_speed(self, cpu):
speed = cpu.get('Max Speed', "0")
return speed
def get_sku(self):
return self.dmi.get("System")[0].get("SKU Number", self.default).strip()
def get_version(self):
return self.dmi.get("System")[0].get("Version", self.default).strip()
def get_uuid(self):
return self.dmi.get("System")[0].get("UUID", '').strip()
def get_family(self):
return self.dmi.get("System")[0].get("Family", '')
def get_chassis(self):
return self.dmi.get("Chassis")[0].get("Type", '_virtual')
def get_type(self):
chassis_type = self.get_chassis()
return self.translation_to_devicehub(chassis_type)
def translation_to_devicehub(self, original_type):
lower_type = original_type.lower()
CHASSIS_TYPE = {
'Desktop': [
'desktop',
'low-profile',
'tower',
'docking',
'all-in-one',
'pizzabox',
'mini-tower',
'space-saving',
'lunchbox',
'mini',
'stick',
],
'Laptop': [
'portable',
'laptop',
'convertible',
'tablet',
'detachable',
'notebook',
'handheld',
'sub-notebook',
],
'Server': ['server'],
'Computer': ['_virtual'],
}
for k, v in CHASSIS_TYPE.items():
if lower_type in v:
return k
return self.default
def get_chassis_dh(self):
chassis = self.get_chassis()
lower_type = chassis.lower()
for k, v in CHASSIS_DH.items():
if lower_type in v:
return k
return self.default
def get_data_storage_type(self, x):
# TODO @cayop add more SSDS types
SSDS = ["nvme"]
SSD = 'SolidStateDrive'
HDD = 'HardDrive'
type_dev = x.get('device', {}).get('type')
trim = x.get('trim', {}).get("supported") in [True, "true"]
return SSD if type_dev in SSDS or trim else HDD
def get_data_storage_interface(self, x):
interface = x.get('device', {}).get('protocol', 'ATA')
if interface.upper() in DATASTORAGEINTERFACE:
return interface.upper()
txt = "Sid: {}, interface {} is not in DataStorageInterface Enum".format(
self.sid, interface
)
self.errors("{}".format(err))
def get_data_storage_size(self, x):
return x.get('user_capacity', {}).get('bytes')
def parse_hwinfo(self):
hw_blocks = self.hwinfo_raw.split("\n\n")
return [x.split("\n") for x in hw_blocks]
def loads(self, x):
if isinstance(x, str):
try:
return json.loads(x)
try:
hw = json.loads(x)
except json.decoder.JSONDecodeError:
hw = json.loads(repair_json(x))
return hw
except Exception as ss:
logger.warning("%s", ss)
return {}
@ -405,3 +502,4 @@ class ParseSnapshot:
logger.error(txt)
self._errors.append("%s", txt)

2
evidence/views.py
View file

@ -137,7 +137,7 @@ class DownloadEvidenceView(DashboardView, TemplateView):
evidence.get_doc()
data = json.dumps(evidence.doc)
response = HttpResponse(data, content_type="application/json")
response['Content-Disposition'] = 'attachment; filename={}'.format("evidence.json")
response['Content-Disposition'] = 'attachment; filename={}'.format("credential.json")
return response

12
evidence/xapian.py
View file

@ -22,14 +22,10 @@ def search(institution, qs, offset=0, limit=10):
qp.set_stemming_strategy(xapian.QueryParser.STEM_SOME)
qp.add_prefix("uuid", "uuid")
query = qp.parse_query(qs)
if institution:
institution_term = "U{}".format(institution.id)
final_query = xapian.Query(
xapian.Query.OP_AND, query, xapian.Query(institution_term)
)
else:
final_query = xapian.Query(query)
institution_term = "U{}".format(institution.id)
final_query = xapian.Query(
xapian.Query.OP_AND, query, xapian.Query(institution_term)
)
enquire = xapian.Enquire(database)
enquire.set_query(final_query)
matches = enquire.get_mset(offset, limit)

1
example/dpp-snapshots/hp_probook_450.json
View file

File diff suppressed because one or more lines are too long

1
example/dpp-snapshots/hp_probook_450_2.json
View file

File diff suppressed because one or more lines are too long

1
example/dpp-snapshots/hp_probook_g2.json
View file

File diff suppressed because one or more lines are too long

1
example/dpp-snapshots/hp_probook_g8.json
View file

File diff suppressed because one or more lines are too long

1
example/dpp-snapshots/snapshot01.json
View file

@ -1 +0,0 @@
{"closed": true, "components": [{"actions": [], "manufacturer": "Intel Corporation", "model": "82579LM Gigabit Network Connection", "serialNumber": "00:11:11:11:11:00", "speed": 1000.0, "type": "NetworkAdapter", "variant": "04", "wireless": false}, {"actions": [], "manufacturer": "Intel Corporation", "model": "7 Series/C216 Chipset Family High Definition Audio Controller", "serialNumber": null, "type": "SoundCard"}, {"actions": [], "format": "DIMM", "interface": "DDR3", "manufacturer": "Micron", "model": "16KTF51264AZ", "serialNumber": "AAAAAAAA", "size": 4096.0, "speed": 1600.0, "type": "RamModule"}, {"actions": [{"endTime": "2022-10-11T13:45:31.239555+00:00", "severity": "Info", "startTime": "2021-10-11T09:45:19.623967+00:00", "steps": [{"endTime": "2021-10-11T11:05:28.090897+00:00", "severity": "Info", "startTime": "2021-10-11T09:45:19.624163+00:00", "type": "StepZero"}, {"endTime": "2021-10-11T13:45:31.239402+00:00", "severity": "Info", "startTime": "2021-10-11T11:05:28.091255+00:00", "type": "StepRandom"}], "type": "EraseSectors"}, {"assessment": true, "commandTimeout": 30, "currentPendingSectorCount": 0, "elapsed": 60, "length": "Short", "lifetime": 18720, "offlineUncorrectable": 0, "powerCycleCount": 2147, "reallocatedSectorCount": 0, "reportedUncorrectableErrors": 0, "severity": "Info", "status": "Completed without error", "type": "TestDataStorage"}, {"elapsed": 11, "readSpeed": 119.0, "type": "BenchmarkDataStorage", "writeSpeed": 32.7}], "interface": "ATA", "manufacturer": "Seagate", "model": "ST3500418AS", "serialNumber": "AAAAAAAA", "size": 500000.0, "type": "HardDrive", "variant": "CC46"}, {"actions": [{"elapsed": 0, "rate": 25540.36, "type": "BenchmarkProcessor"}, {"elapsed": 8, "rate": 7.6939, "type": "BenchmarkProcessorSysbench"}], "address": 64, "brand": "Core i5", "cores": 4, "generation": 3, "manufacturer": "Intel Corp.", "model": "Intel Core i5-3470 CPU @ 3.20GHz", "serialNumber": null, "speed": 1.6242180000000002, "threads": 4, "type": "Processor"}, {"actions": [], "manufacturer": "Intel Corporation", "memory": null, "model": "Xeon E3-1200 v2/3rd Gen Core processor Graphics Controller", "serialNumber": null, "type": "GraphicCard"}, {"actions": [], "biosDate": "2012-08-07T00:00:00", "firewire": 0, "manufacturer": "LENOVO", "model": "MAHOBAY", "pcmcia": 0, "ramMaxSize": 32, "ramSlots": 4, "serial": 1, "serialNumber": null, "slots": 4, "type": "Motherboard", "usb": 3, "version": "9SKT39AUS"}], "device": {"actions": [{"elapsed": 1, "rate": 0.6507, "type": "BenchmarkRamSysbench"}], "chassis": "Tower", "manufacturer": "LENOVO", "model": "3227A2G", "serialNumber": "AAAAAAAA", "sku": "LENOVO_MT_3227", "type": "Desktop", "version": "ThinkCentre M92P"}, "elapsed": 187302510, "endTime": "2016-11-03T17:17:01.116554+00:00", "software": "Workbench", "type": "Snapshot", "uuid": "ae913de1-e639-476a-ad9b-78eabbe4628b", "version": "11.0b11"}

1
example/dpp-snapshots/snapshot02.json
View file

@ -1 +0,0 @@
{"closed": true, "components": [{"actions": [], "manufacturer": "Intel Corporation", "model": "82579LM Gigabit Network Connection", "serialNumber": "00:11:11:11:11:00", "speed": 1000.0, "type": "NetworkAdapter", "variant": "04", "wireless": false}, {"actions": [], "manufacturer": "Intel Corporation", "model": "7 Series/C216 Chipset Family High Definition Audio Controller", "serialNumber": null, "type": "SoundCard"}, {"actions": [], "format": "DIMM", "interface": "DDR3", "manufacturer": "Micron", "model": "16KTF51264AZ", "serialNumber": "AAAAAAAA", "size": 4096.0, "speed": 1600.0, "type": "RamModule"}, {"actions": [{"endTime": "2022-10-11T13:45:31.239555+00:00", "severity": "Info", "startTime": "2021-10-11T09:45:19.623967+00:00", "steps": [{"endTime": "2021-10-11T11:05:28.090897+00:00", "severity": "Info", "startTime": "2021-10-11T09:45:19.624163+00:00", "type": "StepZero"}, {"endTime": "2021-10-11T13:45:31.239402+00:00", "severity": "Info", "startTime": "2021-10-11T11:05:28.091255+00:00", "type": "StepRandom"}], "type": "EraseSectors"}, {"assessment": true, "commandTimeout": 30, "currentPendingSectorCount": 0, "elapsed": 60, "length": "Short", "lifetime": 18720, "offlineUncorrectable": 0, "powerCycleCount": 2147, "reallocatedSectorCount": 0, "reportedUncorrectableErrors": 0, "severity": "Info", "status": "Completed without error", "type": "TestDataStorage"}, {"elapsed": 11, "readSpeed": 119.0, "type": "BenchmarkDataStorage", "writeSpeed": 32.7}], "interface": "ATA", "manufacturer": "Seagate", "model": "ST3500418AS", "serialNumber": "AAAAAAAA", "size": 500000.0, "type": "HardDrive", "variant": "CC46"}, {"actions": [{"elapsed": 0, "rate": 25540.36, "type": "BenchmarkProcessor"}, {"elapsed": 8, "rate": 7.6939, "type": "BenchmarkProcessorSysbench"}], "address": 64, "brand": "Core i5", "cores": 4, "generation": 3, "manufacturer": "Intel Corp.", "model": "Intel Core i5-3470 CPU @ 3.20GHz", "serialNumber": null, "speed": 1.6242180000000002, "threads": 4, "type": "Processor"}, {"actions": [], "manufacturer": "Intel Corporation", "memory": null, "model": "Xeon E3-1200 v2/3rd Gen Core processor Graphics Controller", "serialNumber": null, "type": "GraphicCard"}, {"actions": [], "biosDate": "2012-08-07T00:00:00", "firewire": 0, "manufacturer": "LENOVO", "model": "MAHOBAY", "pcmcia": 0, "ramMaxSize": 32, "ramSlots": 4, "serial": 1, "serialNumber": null, "slots": 4, "type": "Motherboard", "usb": 3, "version": "9SKT39AUS"}], "device": {"actions": [{"elapsed": 1, "rate": 0.6507, "type": "BenchmarkRamSysbench"}], "chassis": "Tower", "manufacturer": "LENOVO", "model": "3227A2G", "serialNumber": "AAAAAAAAD", "sku": "LENOVO_MT_3227", "type": "Desktop", "version": "ThinkCentre M92P"}, "elapsed": 187302510, "endTime": "2016-11-03T17:17:01.116554+00:00", "software": "Workbench", "type": "Snapshot", "uuid": "ae913de1-e639-476a-ad9b-78eabbe4625b", "version": "11.0b11"}

BIN
locale/ca/LC_MESSAGES/django.mo Normal file
View file

Binary file not shown.

716
locale/ca/LC_MESSAGES/django.po Normal file
View file

@ -0,0 +1,716 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-11-28 03:35-0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: ca\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: admin/templates/admin_panel.html:14
msgid "Institution"
msgstr "Institució"
#: admin/templates/admin_users.html:10
msgid "New user"
msgstr "Afegeix un nou usuari"
#: admin/templates/admin_users.html:19
msgid "Email"
msgstr "correu electrònic"
#: admin/templates/admin_users.html:20 admin/views.py:26
#: dashboard/templates/base.html:86
msgid "Admin"
msgstr "Administrador"
#: admin/templates/admin_users.html:21
msgid "Actions"
msgstr "Accions"
#: admin/templates/admin_users.html:28
msgid "Yes"
msgstr "Sí"
#: admin/templates/admin_users.html:28
msgid "No"
msgstr "No"
#: admin/templates/delete_user.html:33 admin/templates/institution.html:27
#: admin/templates/user.html:27 api/templates/new_token.html:27
#: device/templates/new_annotation.html:39 device/templates/new_device.html:81
#: device/templates/physical_properties.html:117
#: evidence/templates/ev_details.html:92
#: evidence/templates/ev_eraseserver.html:52 evidence/templates/upload.html:25
#: lot/templates/delete_lot.html:33 lot/templates/new_annotation.html:39
#: lot/templates/new_lot.html:27 user/templates/settings.html:27
msgid "Cancel"
msgstr "Cancel·la"
#: admin/templates/delete_user.html:34 api/tables.py:29
#: evidence/templates/ev_details.html:97 lot/templates/delete_lot.html:34
msgid "Delete"
msgstr "Elimina"
#: admin/templates/institution.html:28 admin/templates/user.html:28
#: api/templates/new_token.html:28 device/templates/new_annotation.html:40
#: device/templates/new_device.html:82
#: device/templates/physical_properties.html:118
#: evidence/templates/ev_details.html:93
#: evidence/templates/ev_eraseserver.html:53 evidence/templates/upload.html:26
#: lot/templates/new_annotation.html:40 lot/templates/new_lot.html:28
#: user/templates/settings.html:28
msgid "Save"
msgstr "Desa"
#: admin/views.py:27
msgid "admin"
msgstr "administrador"
#: admin/views.py:36 dashboard/templates/base.html:96
msgid "Users"
msgstr "Usuaris"
#: admin/views.py:37
msgid "admin / Users"
msgstr "administrador / Usuaris"
#: admin/views.py:49 user/views.py:18
msgid "User"
msgstr "Usuari"
#: admin/views.py:50
msgid "admin / User"
msgstr "administrador / Usuari"
#: admin/views.py:74
msgid "Delete user"
msgstr "Elimina usuari"
#: admin/views.py:91
msgid "Edit user"
msgstr "Edita usuari"
#: admin/views.py:110 admin/views.py:112
msgid "Edit institution"
msgstr "Edita institució"
#: api/tables.py:51
msgid "Token"
msgstr "Token"
#: api/tables.py:52 evidence/forms.py:65 evidence/templates/ev_details.html:18
#: evidence/templates/ev_eraseserver.html:18
msgid "Tag"
msgstr "Etiqueta"
#: api/templates/custom_table.html:65 dashboard/templates/pagination.html:13
msgid "Previous"
msgstr "Anterior"
#: api/templates/custom_table.html:91 dashboard/templates/pagination.html:38
#: login/templates/login.html:41
msgid "Next"
msgstr "Següent"
#: api/templates/token.html:13
msgid "Generate a new token"
msgstr "Genera un nou token"
#: api/views.py:144 api/views.py:178 api/views.py:196
msgid "Credential management"
msgstr "Gestió de credencials"
#: api/views.py:146
msgid "Managament Tokens"
msgstr "Tokens de gestió"
#: api/views.py:180 api/views.py:198
msgid "New Tokens"
msgstr "Nous Tokens"
#: dashboard/mixins.py:15
msgid "Permission denied. User is not authenticated"
msgstr "Permís denegat. L'usuari no està autenticat"
#: dashboard/templates/base.html:91
msgid "Panel"
msgstr "Panell"
#: dashboard/templates/base.html:105 evidence/templates/ev_details.html:15
#: evidence/templates/ev_eraseserver.html:15
msgid "Devices"
msgstr "Dispositius"
#: dashboard/templates/base.html:110
msgid "Unassigned"
msgstr "Sense assignar"
#: dashboard/templates/base.html:118 device/templates/details.html:24
msgid "Lots"
msgstr "Lots"
#: dashboard/templates/base.html:133 device/templates/details.html:30
#: evidence/views.py:28 evidence/views.py:87 evidence/views.py:174
msgid "Evidences"
msgstr "Evidències"
#: dashboard/templates/base.html:138
msgid "Upload"
msgstr "Carregar"
#: dashboard/templates/base.html:143
msgid "Old evidences"
msgstr "Evidències antigues"
#: dashboard/templates/base.html:151
msgid "Placeholders"
msgstr "Marcadors de posició"
#: dashboard/templates/base.html:156
msgid "Import from spreadsheet"
msgstr "Carrega full de càlcul"
#: dashboard/templates/base.html:161
msgid "Add device"
msgstr "Afegeix un dispositiu"
#: dashboard/templates/base.html:186
msgid "Search your device"
msgstr "Cerca dispositius"
#: dashboard/templates/unassigned_devices.html:15
#: device/templates/details.html:21 device/templates/details.html:150
#: lot/templates/documents.html:22
msgid "Documents"
msgstr "Documents"
#: dashboard/templates/unassigned_devices.html:20
msgid "Exports"
msgstr "Exportacions"
#: dashboard/templates/unassigned_devices.html:25
#: device/templates/details.html:111 lot/templates/annotations.html:22
msgid "Annotations"
msgstr "Annotations"
#: dashboard/templates/unassigned_devices.html:41
msgid "Short ID"
msgstr "identificació"
#: dashboard/templates/unassigned_devices.html:44 device/forms.py:25
#: evidence/templates/ev_details.html:38
msgid "Type"
msgstr "Tipus"
#: dashboard/templates/unassigned_devices.html:47
#: device/templates/details.html:71
msgid "Manufacturer"
msgstr "Fabricant"
#: dashboard/templates/unassigned_devices.html:50
#: device/templates/details.html:78
msgid "Model"
msgstr "Model"
#: dashboard/templates/unassigned_devices.html:80
msgid "Remove"
msgstr "Eliminar"
#: dashboard/templates/unassigned_devices.html:83
msgid "Add"
msgstr "Afegir"
#: dashboard/views.py:18
msgid "Unassigned Devices"
msgstr "Dispositius no assignats"
#: dashboard/views.py:28
msgid "Lot Devices"
msgstr "Dispositius del lot"
#: dashboard/views.py:52
msgid "Search Devices"
msgstr "Cerca dispositius"
#: device/forms.py:26
msgid "Amount"
msgstr "Quantitat"
#: device/forms.py:27
msgid "Custom id"
msgstr "Identificador personalitzat"
#: device/forms.py:28 user/models.py:10
msgid "Name"
msgstr "Nom"
#: device/forms.py:29 device/templates/details.html:119
#: device/templates/details.html:158 lot/templates/annotations.html:27
#: lot/templates/documents.html:27
msgid "Value"
msgstr "Valor"
#: device/templates/details.html:15
msgid "General details"
msgstr "Detalls generals"
#: device/templates/details.html:18
msgid "User annotations"
msgstr "Annotations de l'usuari"
#: device/templates/details.html:27
msgid "Components"
msgstr "Components"
#: device/templates/details.html:41
msgid "Details"
msgstr "Detalls"
#: device/templates/details.html:50
msgid "Is a erase server"
msgstr "És un servidor d'esborrat"
#: device/templates/details.html:85
msgid "Serial Number"
msgstr "Número de sèrie"
#: device/templates/details.html:93
msgid "Identifiers"
msgstr "Identificadors"
#: device/templates/details.html:107 lot/templates/annotations.html:17
msgid "Add new annotation"
msgstr "Afegeix una nova anotació"
#: device/templates/details.html:116 device/templates/details.html:155
#: lot/templates/annotations.html:26 lot/templates/documents.html:26
msgid "Key"
msgstr "Clau"
#: device/templates/details.html:122 device/templates/details.html:161
#: lot/templates/annotations.html:28
msgid "Created on"
msgstr "Creat el"
#: device/templates/details.html:146 lot/templates/documents.html:17
msgid "Add new document"
msgstr "Afegeix un nou document"
#: device/templates/details.html:197
msgid "Components last evidence"
msgstr "Última evidència dels components"
#: device/templates/details.html:218
msgid "List of evidences"
msgstr "Llista d'evidències"
#: device/templates/new_device.html:60
msgid "Component details"
msgstr "Detalls del component"
#: device/templates/new_device.html:65
msgid "Add component"
msgstr "Afegeix component"
#: device/views.py:23
msgid "New Device"
msgstr "Nou dispositiu"
#: device/views.py:69
msgid "Update Device"
msgstr "Actualitza dispositiu"
#: device/views.py:88
msgid "Device"
msgstr "Dispositiu"
#: device/views.py:172
msgid "New annotation"
msgstr "Nova anotació"
#: device/views.py:205 lot/views.py:147 lot/views.py:171
msgid "New Document"
msgstr "Nou document"
#: evidence/forms.py:16
msgid "File"
msgstr "Fitxer"
#: evidence/forms.py:39
msgid "The snapshot already exists"
msgstr "La instantània ja existeix"
#: evidence/forms.py:46
#, python-format
msgid "Error on '%(file_name)s': %(error)s"
msgstr "Error en '%(file_name)s': %(error)s"
#: evidence/forms.py:120
msgid "File to import"
msgstr "Fitxer a importar"
#: evidence/forms.py:138
#, python-format
msgid "Error on '%(file_name)s': Invalid File"
msgstr "Error en '%(file_name)s': Fitxer invàlid"
#: evidence/forms.py:147
msgid "The file you try to import is empty!"
msgstr "El fitxer que intentes importar està buit!"
#: evidence/forms.py:183
msgid "Is a Erase Server"
msgstr "És un servidor d'esborrat"
#: evidence/templates/ev_details.html:21
#: evidence/templates/ev_eraseserver.html:21
msgid "Erase Server"
msgstr "Servidor d'esborrat"
#: evidence/templates/ev_details.html:24
#: evidence/templates/ev_eraseserver.html:24
msgid "Download File"
msgstr "Descarrega fitxer"
#: evidence/templates/ev_details.html:41
msgid "Identificator"
msgstr "Identificador"
#: evidence/templates/ev_details.html:44
msgid "Data"
msgstr "Dades"
#: evidence/views.py:44
msgid "Upload Evidence"
msgstr "Carrega evidència"
#: evidence/views.py:51
msgid "Evidence uploaded successfully."
msgstr "Evidència carregada amb èxit."
#: evidence/views.py:63
msgid "Import Evidence"
msgstr "Importa evidència"
#: evidence/views.py:75
msgid "Evidence imported successfully."
msgstr "Evidència importada amb èxit."
#: login/templates/2fadmin.html:8
msgid "Two-factor Authentication"
msgstr "Autenticació de dos factors"
#: login/templates/2fadmin.html:15
msgid "We have sent you an email with a link that you have to click to log in."
msgstr ""
"T'hem enviat un correu electrònic amb un enllaç que has de fer clic per "
"iniciar sessió."
#: login/templates/2fadmin_email.html:3 login/templates/2fadmin_email.txt:2
#, python-format
msgid "You're receiving this email because you tried to access %(site_name)s."
msgstr ""
"Estàs rebent aquest correu electrònic perquè has intentat accedir a "
"%(site_name)s."
#: login/templates/2fadmin_email.html:7 login/templates/2fadmin_email.txt:4
msgid "Please go to the following page"
msgstr "Si us plau, ves a la pàgina següent"
#: login/templates/2fadmin_email.html:19 login/templates/2fadmin_email.txt:10
#: login/templates/activate_user_email.html:24
#: login/templates/activate_user_email.txt:15
#: login/templates/password_reset_email.html:23
#: login/templates/password_reset_email.txt:10
msgid "Thanks for using our site!"
msgstr "Gràcies per utilitzar el nostre lloc!"
#: login/templates/2fadmin_email.html:23 login/templates/2fadmin_email.txt:12
#: login/templates/password_reset_email.html:27
#: login/templates/password_reset_email.txt:12
#, python-format
msgid "The %(site_name)s team"
msgstr "L'equip de %(site_name)s"
#: login/templates/2fadmin_email.txt:8
#: login/templates/password_reset_email.html:19
#: login/templates/password_reset_email.txt:8
msgid "Your username, in case you've forgotten:"
msgstr "El teu nom d'usuari, per si l'has oblidat:"
#: login/templates/2fadmin_email_subject.txt:2
#, python-format
msgid "Authentication in %(site_name)s"
msgstr "Autenticació a %(site_name)s"
#: login/templates/activate_user_email.html:2
#: login/templates/activate_user_email.txt:3
msgid "DeviceHub"
msgstr "DeviceHub"
#: login/templates/activate_user_email.html:4
#: login/templates/activate_user_email.txt:5
#, python-format
msgid ""
"You're receiving this email because your user account at %(site)s has been "
"activated."
msgstr ""
"Estàs rebent aquest correu electrònic perquè el teu compte d'usuari a "
"%(site)s ha estat activat."
#: login/templates/activate_user_email.html:8
#: login/templates/activate_user_email.txt:7
msgid "Your username is:"
msgstr "El teu nom d'usuari és:"
#: login/templates/activate_user_email.html:12
#: login/templates/activate_user_email.txt:9
msgid "Please go to the following page and choose a password:"
msgstr "Si us plau, ves a la pàgina següent i tria una contrasenya:"
#: login/templates/activate_user_email.html:28
#: login/templates/activate_user_email.txt:17
#, python-format
msgid "The %(site)s team"
msgstr "L'equip de %(site)s"
#: login/templates/activate_user_subject.txt:2
msgid "IdHub"
msgstr "IdHub"
#: login/templates/activate_user_subject.txt:3
#, python-format
msgid "User activation on %(site)s"
msgstr "Activació d'usuari a %(site)s"
#: login/templates/login.html:7
msgid "Sign in"
msgstr "Inicia sessió"
#: login/templates/login.html:48
msgid "Forgot your password?"
msgstr "Has oblidat la teva contrasenya?"
#: login/templates/login2.html:45
msgid "Log in"
msgstr "Inicia sessió"
#: login/templates/login2.html:50
msgid "Forgot your password? Click here to recover"
msgstr "Has oblidat la teva contrasenya? Fes clic aquí per recuperar-la"
#: login/templates/password_reset.html:7
msgid "Password Reset"
msgstr "Restabliment de contrasenya"
#: login/templates/password_reset.html:9
msgid ""
"Enter your email address below, and we'll email instructions for setting a "
"new one."
msgstr ""
"Introdueix la teva adreça de correu electrònic a continuació i t'enviarem "
"instruccions per establir-ne una de nova."
#: login/templates/password_reset.html:15
msgid "Reset"
msgstr "Restableix"
#: login/templates/password_reset.html:21
#: login/templates/password_reset_complete.html:21
#: login/templates/password_reset_done.html:14
msgid "Back to login"
msgstr "Torna a iniciar sessió"
#: login/templates/password_reset_complete.html:10
msgid "Password reset complete"
msgstr "Restabliment de contrasenya complet"
#: login/templates/password_reset_complete.html:12
msgid "Your new password has been set. You may go ahead and log in now."
msgstr "La teva contrasenya ha estat establerta. Ara pots iniciar sessió."
#: login/templates/password_reset_confirm.html:9
msgid "Enter new password"
msgstr "Introdueix una nova contrasenya"
#: login/templates/password_reset_confirm.html:10
msgid ""
"Please enter your new password twice so we can verify you typed it in "
"correctly."
msgstr ""
"Si us plau, introdueix la teva nova contrasenya dues vegades perquè puguem "
"verificar que l'has escrit correctament."
#: login/templates/password_reset_confirm.html:21
msgid "Change my password"
msgstr "Canvia la meva contrasenya"
#: login/templates/password_reset_confirm.html:29
msgid "Password reset unsuccessful"
msgstr "Restabliment de contrasenya no reeixit"
#: login/templates/password_reset_confirm.html:30
msgid ""
"The password reset link was invalid, possibly because it has already been "
"used."
msgstr ""
"L'enllaç de restabliment de contrasenya no és vàlid, possiblement perquè ja "
"s'ha utilitzat."
#: login/templates/password_reset_confirm.html:31
msgid "Please request a new password reset."
msgstr "Si us plau, sol·licita un nou restabliment de contrasenya."
#: login/templates/password_reset_done.html:7
msgid "Password reset sent"
msgstr "Restabliment de contrasenya enviat"
#: login/templates/password_reset_done.html:8
msgid ""
"We've sent you an email with instructions to reset your password. If an "
"account with the provided email exists, you should receive it shortly."
msgstr ""
"T'hem enviat per correu electrònic instruccions per establir la teva "
"contrasenya, si existeix un compte amb el correu electrònic que has "
"introduït. Hauries de rebre-les en breu."
#: login/templates/password_reset_done.html:9
msgid ""
"If you don't receive an email, please check the email address you entered "
"and look in your spam folder."
msgstr ""
"Si no reps un correu electrònic, si us plau, assegura't que has introduït "
"l'adreça amb la qual et vas registrar i revisa la teva carpeta de correu "
"brossa."
#: login/templates/password_reset_email.html:3
#: login/templates/password_reset_email.txt:2
#, python-format
msgid ""
"You're receiving this email because you requested a password reset for your "
"user account at %(site_name)s."
msgstr ""
"Estàs rebent aquest correu electrònic perquè has sol·licitat un restabliment "
"de contrasenya per al teu compte d'usuari a %(site_name)s."
#: login/templates/password_reset_email.html:7
#: login/templates/password_reset_email.txt:4
msgid "Please go to the following page and choose a new password:"
msgstr "Si us plau, aneu a la pàgina següent i trieu una nova contrasenya:"
#: login/templates/password_reset_subject.txt:2
#, python-format
msgid "Password reset on %(site_name)s"
msgstr "Restabliment de la contrasenya a %(site_name)s"
#: login/views.py:20
msgid "Login"
msgstr "Inicia sessió"
#: login/views.py:45
msgid "Login error. Check credentials."
msgstr "Error d'inici de sessió. comprovar les credencials"
#: lot/templates/documents.html:28
msgid " Created on"
msgstr "Creat el"
#: lot/templates/lots.html:12
msgid "Hide closed lots"
msgstr "Amaga lots tancats"
#: lot/templates/lots.html:16
msgid "Show closed lots"
msgstr "Mostra lots tancats"
#: lot/templates/lots.html:22
msgid "Add new lot"
msgstr "Afegeix un nou lot"
#: lot/views.py:18
msgid "New lot"
msgstr "Nou lot"
#: lot/views.py:39
msgid "Delete lot"
msgstr "Elimina lot"
#: lot/views.py:58
msgid "Edit lot"
msgstr "Edita lot"
#: lot/views.py:84
msgid "Add to lots"
msgstr "Afegeix als lots"
#: lot/views.py:112
msgid "Remove from lots"
msgstr "Elimina dels lots"
#: lot/views.py:124 lot/views.py:125
msgid "lots"
msgstr "lots"
#: lot/views.py:194 lot/views.py:217
msgid "New Annotation"
msgstr "Nova anotació"
#: user/models.py:16
msgid "Logo"
msgstr "Logotip"
#: user/models.py:17
msgid "Location"
msgstr "Ubicació"
#: user/models.py:19
msgid "Responsable"
msgstr "Responsable"
#: user/models.py:25
msgid "Supervisor"
msgstr "Supervisor"
#: user/models.py:67
msgid "Email address"
msgstr "Adreça electrònica"
#: user/models.py:71
msgid "is active"
msgstr "està actiu"
#: user/models.py:72
msgid "is admin"
msgstr "és administrador"
#: user/models.py:73
msgid "First name"
msgstr "Nom"
#: user/models.py:74
msgid "Last name"
msgstr "Cognom"
#: user/templates/panel.html:17
msgid "Admin your Tokens"
msgstr "Administra els teus tokens"
#: user/templates/panel.html:22
msgid "Download a settings file"
msgstr "Descarrega un fitxer de configuració"
#: user/views.py:25
msgid "Download Settings"
msgstr "Descarrega configuració"

BIN
locale/es/LC_MESSAGES/django.mo Normal file
View file

Binary file not shown.

723
locale/es/LC_MESSAGES/django.po Normal file
View file

@ -0,0 +1,723 @@
# ALGÚN TÍTULO DESCRIPTIVO.
# Copyright (C) AÑO EL TITULAR DE LOS DERECHOS DE AUTOR DEL PAQUETE
# Este archivo se distribuye bajo la misma licencia que el paquete PACKAGE.
# PRIMER AUTOR <EMAIL@ADDRESS>, AÑO.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: VERSIÓN DEL PAQUETE\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-11-28 03:34-0300\n"
"PO-Revision-Date: AÑO-MO-DA HO:MI+ZONE\n"
"Last-Translator: NOMBRE COMPLETO <EMAIL@ADDRESS>\n"
"Language-Team: LENGUAJE <LL@li.org>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: admin/templates/admin_panel.html:14
msgid "Institution"
msgstr "Institución"
#: admin/templates/admin_users.html:10
msgid "New user"
msgstr "Nuevo usuario"
#: admin/templates/admin_users.html:19
msgid "Email"
msgstr "Email"
#: admin/templates/admin_users.html:20 admin/views.py:26
#: dashboard/templates/base.html:86
msgid "Admin"
msgstr "Administrador"
#: admin/templates/admin_users.html:21
msgid "Actions"
msgstr "Acciones"
#: admin/templates/admin_users.html:28
msgid "Yes"
msgstr "Sí"
#: admin/templates/admin_users.html:28
msgid "No"
msgstr "No"
#: admin/templates/delete_user.html:33 admin/templates/institution.html:27
#: admin/templates/user.html:27 api/templates/new_token.html:27
#: device/templates/new_annotation.html:39 device/templates/new_device.html:81
#: device/templates/physical_properties.html:117
#: evidence/templates/ev_details.html:92
#: evidence/templates/ev_eraseserver.html:52 evidence/templates/upload.html:25
#: lot/templates/delete_lot.html:33 lot/templates/new_annotation.html:39
#: lot/templates/new_lot.html:27 user/templates/settings.html:27
msgid "Cancel"
msgstr "Cancelar"
#: admin/templates/delete_user.html:34 api/tables.py:29
#: evidence/templates/ev_details.html:97 lot/templates/delete_lot.html:34
msgid "Delete"
msgstr "Eliminar"
#: admin/templates/institution.html:28 admin/templates/user.html:28
#: api/templates/new_token.html:28 device/templates/new_annotation.html:40
#: device/templates/new_device.html:82
#: device/templates/physical_properties.html:118
#: evidence/templates/ev_details.html:93
#: evidence/templates/ev_eraseserver.html:53 evidence/templates/upload.html:26
#: lot/templates/new_annotation.html:40 lot/templates/new_lot.html:28
#: user/templates/settings.html:28
msgid "Save"
msgstr "Guardar"
#: admin/views.py:27
msgid "admin"
msgstr "administrador"
#: admin/views.py:36 dashboard/templates/base.html:96
msgid "Users"
msgstr "Usuarios"
#: admin/views.py:37
msgid "admin / Users"
msgstr "administrador / Usuarios"
#: admin/views.py:49 user/views.py:18
msgid "User"
msgstr "Usuario"
#: admin/views.py:50
msgid "admin / User"
msgstr "administrador / Usuario"
#: admin/views.py:74
msgid "Delete user"
msgstr "Eliminar usuario"
#: admin/views.py:91
msgid "Edit user"
msgstr "Editar usuario"
#: admin/views.py:110 admin/views.py:112
msgid "Edit institution"
msgstr "Editar institución"
#: api/tables.py:51
msgid "Token"
msgstr "Token"
#: api/tables.py:52 evidence/forms.py:65 evidence/templates/ev_details.html:18
#: evidence/templates/ev_eraseserver.html:18
msgid "Tag"
msgstr "Etiqueta"
#: api/templates/custom_table.html:65 dashboard/templates/pagination.html:13
msgid "Previous"
msgstr "Anterior"
#: api/templates/custom_table.html:91 dashboard/templates/pagination.html:38
#: login/templates/login.html:41
msgid "Next"
msgstr "Siguiente"
#: api/templates/token.html:13
msgid "Generate a new token"
msgstr "Generar un nuevo token"
#: api/views.py:144 api/views.py:178 api/views.py:196
msgid "Credential management"
msgstr "Gestión de credenciales"
#: api/views.py:146
msgid "Managament Tokens"
msgstr "Tokens de gestión"
#: api/views.py:180 api/views.py:198
msgid "New Tokens"
msgstr "Nuevos Tokens"
#: dashboard/mixins.py:15
msgid "Permission denied. User is not authenticated"
msgstr "Permiso denegado. El usuario no está autenticado"
#: dashboard/templates/base.html:91
msgid "Panel"
msgstr "Panel"
#: dashboard/templates/base.html:105 evidence/templates/ev_details.html:15
#: evidence/templates/ev_eraseserver.html:15
msgid "Devices"
msgstr "Dispositivos"
#: dashboard/templates/base.html:110
msgid "Unassigned"
msgstr "Sin asignar"
#: dashboard/templates/base.html:118 device/templates/details.html:24
msgid "Lots"
msgstr "Lotes"
#: dashboard/templates/base.html:133 device/templates/details.html:30
#: evidence/views.py:28 evidence/views.py:87 evidence/views.py:174
msgid "Evidences"
msgstr "Evidencias"
#: dashboard/templates/base.html:138
msgid "Upload"
msgstr "Subir"
#: dashboard/templates/base.html:143
msgid "Old evidences"
msgstr "Evidencias antiguas"
#: dashboard/templates/base.html:151
msgid "Placeholders"
msgstr "Placeholders"
#: dashboard/templates/base.html:156
msgid "Import from spreadsheet"
msgstr "Importar desde hoja de cálculo"
#: dashboard/templates/base.html:161
msgid "Add device"
msgstr "Nuevo Dispositivo"
#: dashboard/templates/base.html:186
msgid "Search your device"
msgstr "Buscar dispositivos"
#: dashboard/templates/unassigned_devices.html:15
#: device/templates/details.html:21 device/templates/details.html:150
#: lot/templates/documents.html:22
msgid "Documents"
msgstr "Documentos"
#: dashboard/templates/unassigned_devices.html:20
msgid "Exports"
msgstr "Exportar"
#: dashboard/templates/unassigned_devices.html:25
#: device/templates/details.html:111 lot/templates/annotations.html:22
msgid "Annotations"
msgstr "Anotaciones"
#: dashboard/templates/unassigned_devices.html:41
msgid "Short ID"
msgstr ""
#: dashboard/templates/unassigned_devices.html:44 device/forms.py:25
#: evidence/templates/ev_details.html:38
msgid "Type"
msgstr "Tipo"
#: dashboard/templates/unassigned_devices.html:47
#: device/templates/details.html:71
msgid "Manufacturer"
msgstr "Fabricante"
#: dashboard/templates/unassigned_devices.html:50
#: device/templates/details.html:78
msgid "Model"
msgstr "Modelo"
#: dashboard/templates/unassigned_devices.html:80
msgid "Remove"
msgstr "Eliminar"
#: dashboard/templates/unassigned_devices.html:83
msgid "Add"
msgstr "Agregar"
#: dashboard/views.py:18
msgid "Unassigned Devices"
msgstr "Sin asignar"
#: dashboard/views.py:28
msgid "Lot Devices"
msgstr "Dispositivos del lote"
#: dashboard/views.py:52
#, fuzzy
#| msgid "Search your device"
msgid "Search Devices"
msgstr "Buscar dispositivos"
#: device/forms.py:26
msgid "Amount"
msgstr "Cantidad"
#: device/forms.py:27
msgid "Custom id"
msgstr "Identificador personalizado"
#: device/forms.py:28 user/models.py:10
msgid "Name"
msgstr "Nombre"
#: device/forms.py:29 device/templates/details.html:119
#: device/templates/details.html:158 lot/templates/annotations.html:27
#: lot/templates/documents.html:27
msgid "Value"
msgstr "Valor"
#: device/templates/details.html:15
msgid "General details"
msgstr "Detalles generales"
#: device/templates/details.html:18
msgid "User annotations"
msgstr "Anotaciones del usuario"
#: device/templates/details.html:27
msgid "Components"
msgstr "Componentes"
#: device/templates/details.html:41
msgid "Details"
msgstr "Detalles"
#: device/templates/details.html:50
msgid "Is a erase server"
msgstr "Es un servidor de borrado"
#: device/templates/details.html:85
msgid "Serial Number"
msgstr "Número de serie"
#: device/templates/details.html:93
msgid "Identifiers"
msgstr "Identificadores"
#: device/templates/details.html:107 lot/templates/annotations.html:17
msgid "Add new annotation"
msgstr "Agregar nueva anotación"
#: device/templates/details.html:116 device/templates/details.html:155
#: lot/templates/annotations.html:26 lot/templates/documents.html:26
msgid "Key"
msgstr "Clave"
#: device/templates/details.html:122 device/templates/details.html:161
#: lot/templates/annotations.html:28
msgid "Created on"
msgstr "Creado el"
#: device/templates/details.html:146 lot/templates/documents.html:17
msgid "Add new document"
msgstr "Agregar nuevo documento"
#: device/templates/details.html:197
msgid "Components last evidence"
msgstr "Última evidencia de componentes"
#: device/templates/details.html:218
msgid "List of evidences"
msgstr "Lista de evidencias"
#: device/templates/new_device.html:60
msgid "Component details"
msgstr "Detalles del componente"
#: device/templates/new_device.html:65
msgid "Add component"
msgstr "Agregar componente"
#: device/views.py:23
msgid "New Device"
msgstr "Nuevo dispositivo"
#: device/views.py:69
msgid "Update Device"
msgstr "Actualizar dispositivo"
#: device/views.py:88
msgid "Device"
msgstr "Dispositivo"
#: device/views.py:172
msgid "New annotation"
msgstr "Nueva anotación"
#: device/views.py:205 lot/views.py:147 lot/views.py:171
#, fuzzy
#| msgid "Documents"
msgid "New Document"
msgstr "Nuevo Documento"
#: evidence/forms.py:16
msgid "File"
msgstr "Archivo"
#: evidence/forms.py:39
msgid "The snapshot already exists"
msgstr "La instantánea ya existe"
#: evidence/forms.py:46
#, python-format
msgid "Error on '%(file_name)s': %(error)s"
msgstr "Error en '%(file_name)s': %(error)s"
#: evidence/forms.py:120
msgid "File to import"
msgstr "Archivo a importar"
#: evidence/forms.py:138
#, python-format
msgid "Error on '%(file_name)s': Invalid File"
msgstr "Error en '%(file_name)s': Archivo inválido"
#: evidence/forms.py:147
msgid "The file you try to import is empty!"
msgstr "¡El archivo que intentas importar está vacío!"
#: evidence/forms.py:183
msgid "Is a Erase Server"
msgstr "Es un servidor de borrado"
#: evidence/templates/ev_details.html:21
#: evidence/templates/ev_eraseserver.html:21
msgid "Erase Server"
msgstr "Servidor de borrado"
#: evidence/templates/ev_details.html:24
#: evidence/templates/ev_eraseserver.html:24
msgid "Download File"
msgstr "Descargar archivo"
#: evidence/templates/ev_details.html:41
msgid "Identificator"
msgstr "Identificador"
#: evidence/templates/ev_details.html:44
msgid "Data"
msgstr "Datos"
#: evidence/views.py:44
msgid "Upload Evidence"
msgstr "Subir evidencia"
#: evidence/views.py:51
msgid "Evidence uploaded successfully."
msgstr "Evidencia subida exitosamente."
#: evidence/views.py:63
msgid "Import Evidence"
msgstr "Importar evidencia"
#: evidence/views.py:75
msgid "Evidence imported successfully."
msgstr "Evidencia importada exitosamente."
#: login/templates/2fadmin.html:8
msgid "Two-factor Authentication"
msgstr "Autenticación de dos factores"
#: login/templates/2fadmin.html:15
msgid "We have sent you an email with a link that you have to click to log in."
msgstr ""
"Te hemos enviado un correo electrónico con un enlace que debes hacer clic "
"para iniciar sesión."
#: login/templates/2fadmin_email.html:3 login/templates/2fadmin_email.txt:2
#, python-format
msgid "You're receiving this email because you tried to access %(site_name)s."
msgstr ""
"Estás recibiendo este correo electrónico porque intentaste acceder a "
"%(site_name)s."
#: login/templates/2fadmin_email.html:7 login/templates/2fadmin_email.txt:4
msgid "Please go to the following page"
msgstr "Por favor, ve a la siguiente página"
#: login/templates/2fadmin_email.html:19 login/templates/2fadmin_email.txt:10
#: login/templates/activate_user_email.html:24
#: login/templates/activate_user_email.txt:15
#: login/templates/password_reset_email.html:23
#: login/templates/password_reset_email.txt:10
msgid "Thanks for using our site!"
msgstr "¡Gracias por usar nuestro sitio!"
#: login/templates/2fadmin_email.html:23 login/templates/2fadmin_email.txt:12
#: login/templates/password_reset_email.html:27
#: login/templates/password_reset_email.txt:12
#, python-format
msgid "The %(site_name)s team"
msgstr "El equipo de %(site_name)s"
#: login/templates/2fadmin_email.txt:8
#: login/templates/password_reset_email.html:19
#: login/templates/password_reset_email.txt:8
msgid "Your username, in case you've forgotten:"
msgstr "Tu nombre de usuario, en caso de que lo hayas olvidado:"
#: login/templates/2fadmin_email_subject.txt:2
#, python-format
msgid "Authentication in %(site_name)s"
msgstr "Autenticación en %(site_name)s"
#: login/templates/activate_user_email.html:2
#: login/templates/activate_user_email.txt:3
msgid "DeviceHub"
msgstr "DeviceHub"
#: login/templates/activate_user_email.html:4
#: login/templates/activate_user_email.txt:5
#, python-format
msgid ""
"You're receiving this email because your user account at %(site)s has been "
"activated."
msgstr ""
"Estás recibiendo este correo electrónico porque tu cuenta de usuario en "
"%(site)s ha sido activada."
#: login/templates/activate_user_email.html:8
#: login/templates/activate_user_email.txt:7
msgid "Your username is:"
msgstr "Tu nombre de usuario es:"
#: login/templates/activate_user_email.html:12
#: login/templates/activate_user_email.txt:9
msgid "Please go to the following page and choose a password:"
msgstr "Por favor, ve a la siguiente página y elige una contraseña:"
#: login/templates/activate_user_email.html:28
#: login/templates/activate_user_email.txt:17
#, python-format
msgid "The %(site)s team"
msgstr "El equipo de %(site)s"
#: login/templates/activate_user_subject.txt:2
msgid "IdHub"
msgstr "IdHub"
#: login/templates/activate_user_subject.txt:3
#, python-format
msgid "User activation on %(site)s"
msgstr "Activación de usuario en %(site)s"
#: login/templates/login.html:7
msgid "Sign in"
msgstr "Iniciar sesión"
#: login/templates/login.html:48
msgid "Forgot your password?"
msgstr "¿Olvidaste tu contraseña?"
#: login/templates/login2.html:45
msgid "Log in"
msgstr "Iniciar sesión"
#: login/templates/login2.html:50
msgid "Forgot your password? Click here to recover"
msgstr "¿Olvidaste tu contraseña? Haz clic aquí para recuperarla"
#: login/templates/password_reset.html:7
#, fuzzy
#| msgid "Password reset"
msgid "Password Reset"
msgstr "Restablecimiento de contraseña"
#: login/templates/password_reset.html:9
msgid ""
"Enter your email address below, and we'll email instructions for setting a "
"new one."
msgstr ""
"Ingresa tu dirección de correo electrónico a continuación y te enviaremos "
"instrucciones para establecer una nueva."
#: login/templates/password_reset.html:15
msgid "Reset"
msgstr "Reestablecer"
#: login/templates/password_reset.html:21
#: login/templates/password_reset_complete.html:21
#: login/templates/password_reset_done.html:14
msgid "Back to login"
msgstr "Volver a iniciar sesión"
#: login/templates/password_reset_complete.html:10
msgid "Password reset complete"
msgstr "Restablecimiento de contraseña completo"
#: login/templates/password_reset_complete.html:12
msgid "Your new password has been set. You may go ahead and log in now."
msgstr "Tu nueva contraseña ha sido establecida. Ahora puedes iniciar sesión."
#: login/templates/password_reset_confirm.html:9
msgid "Enter new password"
msgstr "Ingresa nueva contraseña"
#: login/templates/password_reset_confirm.html:10
msgid ""
"Please enter your new password twice so we can verify you typed it in "
"correctly."
msgstr ""
"Por favor, ingresa tu nueva contraseña dos veces para que podamos verificar "
"que la escribiste correctamente."
#: login/templates/password_reset_confirm.html:21
msgid "Change my password"
msgstr "Cambiar mi contraseña"
#: login/templates/password_reset_confirm.html:29
msgid "Password reset unsuccessful"
msgstr "Restablecimiento de contraseña fallido"
#: login/templates/password_reset_confirm.html:30
msgid ""
"The password reset link was invalid, possibly because it has already been "
"used."
msgstr ""
"El enlace para restablecer la contraseña no es válido, posiblemente porque "
"ya ha sido utilizado."
#: login/templates/password_reset_confirm.html:31
msgid "Please request a new password reset."
msgstr "Por favor, solicita un nuevo restablecimiento de contraseña."
#: login/templates/password_reset_done.html:7
msgid "Password reset sent"
msgstr "Restablecimiento de contraseña enviado"
#: login/templates/password_reset_done.html:8
msgid ""
"We've sent you an email with instructions to reset your password. If an "
"account with the provided email exists, you should receive it shortly."
msgstr ""
"Te hemos enviado por correo electrónico las instrucciones para establecer tu "
"contraseña. Si existe una cuenta con el correo electrónico que ingresaste, "
"deberías recibirlas en breve."
#: login/templates/password_reset_done.html:9
msgid ""
"If you don't receive an email, please check the email address you entered "
"and look in your spam folder."
msgstr ""
"Si no recibes un correo electrónico, por favor asegúrate de haber ingresado "
"la dirección con la que te registraste y revisa tu carpeta de spam."
#: login/templates/password_reset_email.html:3
#: login/templates/password_reset_email.txt:2
#, python-format
msgid ""
"You're receiving this email because you requested a password reset for your "
"user account at %(site_name)s."
msgstr ""
"Estás recibiendo este correo electrónico porque solicitaste un "
"restablecimiento de contraseña para tu cuenta de usuario en %(site_name)s."
#: login/templates/password_reset_email.html:7
#: login/templates/password_reset_email.txt:4
msgid "Please go to the following page and choose a new password:"
msgstr "Por favor, ve a la siguiente página y elige una nueva contraseña:"
#: login/templates/password_reset_subject.txt:2
#, python-format
msgid "Password reset on %(site_name)s"
msgstr "Restablecimiento de contraseña en %(site_name)s"
#: login/views.py:20
msgid "Login"
msgstr "Iniciar sesión"
#: login/views.py:45
msgid "Login error. Check credentials."
msgstr "Error al iniciar sesión. Verifica tus credenciales."
#: lot/templates/documents.html:28
#, fuzzy
#| msgid "Created on"
msgid " Created on"
msgstr "Creado el"
#: lot/templates/lots.html:12
msgid "Hide closed lots"
msgstr "Ocultar lotes cerrados"
#: lot/templates/lots.html:16
msgid "Show closed lots"
msgstr "Mostrar lotes cerrados"
#: lot/templates/lots.html:22
msgid "Add new lot"
msgstr "Agregar nuevo lote"
#: lot/views.py:18
msgid "New lot"
msgstr "Nuevo lote"
#: lot/views.py:39
msgid "Delete lot"
msgstr "Eliminar lote"
#: lot/views.py:58
msgid "Edit lot"
msgstr "Editar lote"
#: lot/views.py:84
msgid "Add to lots"
msgstr "Agregar a los lotes"
#: lot/views.py:112
msgid "Remove from lots"
msgstr "Eliminar de los lotes"
#: lot/views.py:124 lot/views.py:125
msgid "lots"
msgstr "lotes"
#: lot/views.py:194 lot/views.py:217
msgid "New Annotation"
msgstr "Nueva anotación"
#: user/models.py:16
msgid "Logo"
msgstr "Logotipo"
#: user/models.py:17
msgid "Location"
msgstr "Ubicación"
#: user/models.py:19
msgid "Responsable"
msgstr "Responsable"
#: user/models.py:25
msgid "Supervisor"
msgstr "Supervisor"
#: user/models.py:67
msgid "Email address"
msgstr "Dirección de correo electrónico"
#: user/models.py:71
msgid "is active"
msgstr "está activo"
#: user/models.py:72
msgid "is admin"
msgstr "es administrador"
#: user/models.py:73
msgid "First name"
msgstr "Nombre"
#: user/models.py:74
msgid "Last name"
msgstr "Apellido"
#: user/templates/panel.html:17
msgid "Admin your Tokens"
msgstr "Administra tus tokens"
#: user/templates/panel.html:22
msgid "Download a settings file"
msgstr "Descargar un archivo de configuración"
#: user/views.py:25
msgid "Download Settings"
msgstr "Descargar configuración"

70
login/templates/login.html
View file

@ -1,46 +1,68 @@
{% extends "login_base.html" %}
{% load i18n static %}
{% load i18n static language_code %}
{% block login_content %}
<div class="pt-2 pb-3">
<h5 class="card-title text-center pb-0 fs-4 help"> {% trans "Sign in" %}</h5>
</div>
<form action="{% url 'login:login' %}" method="post" class="row g-3 needs-validation" novalidate>
{% csrf_token %}
<div class="col-12">
<div class="col-12 mb-">
<input type="email" name="username" maxlength="100" autocapitalize="off"
autocorrect="off" class="form-control textinput textInput" id="yourEmail" required
autocorrect="off" class="form-control textinput textInput {% if form.username.errors %}is-invalid{% endif %}" id="yourEmail" required
autofocus placeholder="{{ form.username.label }}"
{% if form.username.value %}value="{{ form.username.value }}" {% endif %}>
<div class="invalid-feedback">Please enter your email.</div>
{% if form.username.errors %}
<p class="text-error">
{{ form.username.errors|striptags }}
</p>
<div class="invalid-feedback d-block">
{{ form.username.errors|striptags }}
</div>
{% endif %}
</div>
<div class="col-12">
<div class="col-12 mb-3">
<div class="input-group">
<input type="password" name="password" maxlength="100" autocapitalize="off"
autocorrect="off" class="form-control textinput textInput" id="id_password"
placeholder="{{ form.password.label }}" required>
<input type="password" name="password" maxlength="100" autocapitalize="off"
autocorrect="off" class="form-control textinput textInput {% if form.password.errors %}is-invalid{% endif %}" id="id_password"
placeholder="{{ form.password.label }}" required>
<i class="input-group-text bi bi-eye" id="togglePassword" style="cursor: pointer"></i>
</div>
{% if form.password.errors %}
<p class="text-error">
{{ form.password.errors|striptags }}
</p>
{% endif %}
<i class="input-group-text bi bi-eye" id="togglePassword" style="cursor: pointer">
</i>
<div class="invalid-feedback d-block">
{{ form.password.errors|striptags }}
</div>
<div class="invalid-feedback">Please enter your password!</div>
{% endif %}
</div>
<input name="next" type="hidden" value="{{ success_url }}">
<div class="col-12">
<button class="btn btn-primary w-100" type="submit">Next</button>
</div>
<div class="col-12 mb-3">
<button class="btn btn-primary w-100" type="submit">{% trans "Next" %}</button>
</div>
</form>
<div id="login-footer" class="mt-3">
<a href="{% url 'login:password_reset' %}" data-toggle="modal" data-target="#forgotPasswordModal">{% trans "Forgot your password? Click here to recover" %}</a>
<div id="login-footer" class="d-flex justify-content-between align-items-center mt-4">
<a href="{% url 'login:password_reset' %}" data-toggle="modal" data-target="#forgotPasswordModal">{% trans "Forgot your password?" %}</a>
<div class="dropdown ms-auto">
<form action="{% url 'set_language' %}" method="post">
{% csrf_token %}
<button class="btn btn-tertiary dropdown-toggle" type="button" id="languageDropdown" data-bs-toggle="dropdown" aria-expanded="false">
{% get_current_language as LANGUAGE_CODE %}
{% get_language_info_list for LANGUAGES as languages %}
{{ LANGUAGE_CODE|get_language_code:languages }}
</button>
<ul class="dropdown-menu dropdown-menu-end" aria-labelledby="languageDropdown">
{% for lang in languages %}
<li>
<button class="dropdown-item" type="submit" name="language" value="{{ lang.code }}">{{ lang.name_local }}</button>
</li>
{% endfor %}
</ul>
</form>
</div>
</div>
{% endblock %}
{% endblock %}

42
login/templates/login_base.html
View file

@ -45,7 +45,7 @@
<div class="container">
<section class="section register min-vh-100 d-flex flex-column align-items-center justify-content-center py-4">
<section class="section register min-vh-100 d-flex flex-column align-items-center justify-content-center">
<div class="container">
<div class="row justify-content-center">
<div class="col-lg-4 col-md-6 d-flex flex-column align-items-center justify-content-center">
@ -57,51 +57,37 @@
</a>
</div><!-- End Logo -->
<div class="card mb-3 shadow p-3 mb-5 bg-body rounded">
<div class="card shadow bg-body rounded">
<div class="card-body">
<div class="pt-2 pb-3">
<h5 class="card-title text-center pb-0 fs-4 help">Sign in</h5>
</div>
{% block login_content %}
{% endblock login_content %}
</div>
</div>
{% if messages %}
<div class="col-12 mt-3">
{% for message in messages %}
<div class="alert alert-danger show text-center" role="alert">
{{message}}
</div>
{% endfor %}
</div>
{% endif %}
<div class="credits">
</div>
</div>
</div>
</div>
</div>
</section>
</div>
<div class="container-fluid">
<div class="row">
<main class="col-md-12 bt-5">
{% block messages %}
{% for message in messages %}
<div class="alert alert-{{ message.tags|default:'info' }} alert-dismissible fade show" role="alert">
{{ message }}
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
{% endfor %}
{% endblock messages %}
</main>
</div>
</div>
<!-- Footer -->
<footer class="footer text-center">
<footer class="footer text-center fixed-bottom bg-light py-3">
<div class="container">
<span class="text-muted">{{ commit_id }}</span>
</div>

39
login/templates/password_reset.html
View file

@ -2,26 +2,23 @@
{% load i18n django_bootstrap5 %}
{% block login_content %}
<div class="well">
<div class="row-fluid">
<h2>{% trans 'Password reset' %}</h2>
<span>{% trans "Forgotten your password? Enter your email address below, and we'll email instructions for setting a new one." %}</span>
</div>
<div class="card-body">
<div class="pt-2 pb-3">
<h4 class="card-title text-center pb-2 help"> {% trans "Password Reset" %}</h5>
</div>
<p class="text-center text-muted fs-6">{% trans "Enter your email address below, and we'll email instructions for setting a new one." %}</p>
<form action="{% url 'login:password_reset' %}" method="post" class="mt-4">
{% csrf_token %}
{% bootstrap_form form layout='floating' %}
{% bootstrap_form_errors form type='non_fields' %}
<div class="d-grid gap-2">
<button type="submit" class="btn btn-primary">{% trans 'Reset' %}</button>
</div>
</form>
</div>
<div class="well">
<div class="row-fluid">
<div>
<form action="{% url 'login:password_reset' %}" role="form" method="post">
{% csrf_token %}
{% bootstrap_form form %}
{% bootstrap_form_errors form type='non_fields' %}
<div class="form-actions-no-box">
<input type="submit" name="submit" value="{% trans 'Reset my password' %}" class="btn btn-primary form-control" id="submit-id-submit">
</div>
</form>
</div>
</div><!-- /.row-fluid -->
</div><!--/.well-->
{% endblock %}
<div class="text-center mt-3">
<a href="{% url 'login:login' %}" class="btn btn-link text-secondary">{% trans 'Back to login' %}</a>
</div>
{% endblock %}

14
login/templates/password_reset_complete.html
View file

@ -6,11 +6,19 @@
<div class="row-fluid">
<div class="well" style="width: 800px; margin: auto auto 50px auto">
<div class="row-fluid">
<h2>{% trans 'Password reset complete' %}</h2>
<p>{% trans 'Your password has been set. You may go ahead and log in now.' %}</p>
<a href="{% url 'login:login' %}">{% trans 'Login' %}</a>
<h2 class="card-title ">{% trans 'Password reset complete' %}</h2>
<p class="text-muted fs-6 mt-4">{% trans 'Your new password has been set. You may go ahead and log in now.' %}</p>
</div>
</div><!--/.well-->
</div><!-- /.row-fluid -->
<div class="text-end mt-3">
<a href="{% url 'login:login' %}" class="btn btn-link text-secondary">{% trans 'Back to login' %}</a>
</div>
</div><!-- /.container-fluid -->
{% endblock %}

12
login/templates/password_reset_done.html
View file

@ -4,12 +4,14 @@
{% block login_content %}
<div class="well">
<div class="row-fluid">
<h2>{% trans 'Password reset sent' %}</h2>
<p>{% trans "We've emailed you instructions for setting your password, if an account exists with the email you entered. You should receive them shortly." %}</p>
<p>{% trans "If you don't receive an email, please make sure you've entered the address you registered with, and check your spam folder." %}</p>
<h4 class="card-title text-center text-bold">{% trans 'Password reset sent' %}</h4>
<p class="text-center text-muted mt-4 fs-7">{% trans "We've sent you an email with instructions to reset your password. If an account with the provided email exists, you should receive it shortly." %}</p>
<p class="text-center text-muted fs-7">{% trans "If you don't receive an email, please check the email address you entered and look in your spam folder." %}</p>
</div><!-- /.row-fluid -->
<div class="text-center mt-3">
<a href="{% url 'login:login' %}" class="btn btn-link text-primary">{% trans 'Back to login' %}</a>
</div>
</div><!--/.well-->
{% endblock %}

5
login/views.py
View file

@ -1,5 +1,6 @@
import logging
from django.contrib import messages
from django.conf import settings
from django.urls import reverse_lazy
from django.contrib.auth import views as auth_views
@ -39,6 +40,10 @@ class LoginView(auth_views.LoginView):
return redirect(reverse_lazy("login:login"))
return redirect(self.extra_context['success_url'])
def form_invalid(self, form):
messages.error(self.request, _("Login error. Check credentials."))
return self.render_to_response(self.get_context_data(form=form), status=401)
def LogoutView(request):

10
lot/templates/annotations.html
View file

@ -14,18 +14,18 @@
<a href="{% url 'lot:add_annotation' lot.pk %}" class="btn btn-primary">
<i class="bi bi-plus"></i>
Add new annotation
{%trans "Add new annotation"%}
<span class="caret"></span>
</a>
</div>
<h5 class="card-title mt-2">Annotations</h5>
<h5 class="card-title mt-2">{% trans "Annotations" %}</h5>
<table class="table table-striped">
<thead>
<tr>
<th scope="col">Key</th>
<th scope="col">Value</th>
<th scope="col" data-type="date" data-format="YYYY-MM-DD hh:mm">Created on</th>
<th scope="col">{%trans "Key"%}</th>
<th scope="col">{%trans "Value"%}</th>
<th scope="col" data-type="date" data-format="YYYY-MM-DD hh:mm">{%trans "Created on" %}</th>
<th></th>
<th></th>
</tr>

10
lot/templates/documents.html
View file

@ -14,18 +14,18 @@
<a href="{% url 'lot:add_document' lot.pk %}" class="btn btn-primary">
<i class="bi bi-plus"></i>
Add new document
{% trans "Add new document"%}
<span class="caret"></span>
</a>
</div>
<h5 class="card-title mt-2">Documents</h5>
<h5 class="card-title mt-2">{%trans "Documents"%}</h5>
<table class="table table-striped">
<thead>
<tr>
<th scope="col">Key</th>
<th scope="col">Value</th>
<th scope="col" data-type="date" data-format="YYYY-MM-DD hh:mm">Created on</th>
<th scope="col">{% trans "Key"%}</th>
<th scope="col">{% trans "Value"%}</th>
<th scope="col" data-type="date" data-format="YYYY-MM-DD hh:mm">{%trans " Created on" %}</th>
<th></th>
<th></th>
</tr>

4
requirements.txt
View file

@ -11,7 +11,3 @@ xlrd==2.0.1
odfpy==1.4.1
pytz==2024.2
json-repair==0.30.0
setuptools==65.5.1
requests==2.32.3
wheel==0.45.1

11
utils/constants.py
View file

@ -17,19 +17,8 @@ HID_ALGO1 = [
"sku"
]
LEGACY_DPP = [
"manufacturer",
"model",
"chassis",
"serialNumber",
"sku",
"type",
"version"
]
ALGOS = {
"hidalgo1": HID_ALGO1,
"legacy_dpp": LEGACY_DPP
}

30
utils/logger.py
View file

@ -18,28 +18,20 @@ class CustomFormatter(logging.Formatter):
color = PURPLE
else:
color = RESET
record.levelname = f"{color}{record.levelname}{RESET}"
if record.args:
try:
record.msg = record.msg % record.args
record.args = ()
except (TypeError, ValueError):
record.msg = f"{color}{record.msg}{RESET}"
# Highlight the final formatted message
record.msg = self.highlight_message(record.msg, color)
# pedro says: I discovered that trace is provided anyway with
# this commented (reason: strange None msgs)
# is this needed?
### provide trace when DEBUG config
#if settings.DEBUG:
# import traceback
# print(traceback.format_exc())
record.msg = self.highlight_args(record.msg, record.args, color)
record.args = ()
# provide trace when DEBUG config
if settings.DEBUG:
import traceback
print(traceback.format_exc())
return super().format(record)
def highlight_message(self, message, color):
return f"{color}{message}{RESET}"
def highlight_args(self, message, args, color):
highlighted_args = tuple(f"{color}{arg}{RESET}" for arg in args)
return message % highlighted_args

5
utils/save_snapshots.py
View file

@ -19,10 +19,7 @@ def move_json(path_name, user, place="snapshots"):
def save_in_disk(data, user, place="snapshots"):
uuid = data.get("uuid")
if data.get("credentialSubject"):
uuid = data["credentialSubject"].get("uuid")
uuid = data.get('uuid', '')
now = datetime.now()
year = now.year
month = now.month