nopaste: Require an account when creating new pastes

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/backend/nopaste.py b/src/backend/nopaste.py
index 8cc462f2e94525044bd9518d17e98e68c9662c18..499aff369be7cb5c9361618666280aacdc129817 100644 (file)
--- a/src/backend/nopaste.py
+++ b/src/backend/nopaste.py
@@ -23,7 +23,7 @@ class Nopaste(Object):
        def _get_paste(self, query, *args, **kwargs):
                return self.db.fetch_one(Paste, query, *args, **kwargs)
 
-       def create(self, content, subject=None, mimetype=None, expires=None, account=None, address=None):
+       def create(self, content, account, subject=None, mimetype=None, expires=None, address=None):
                # Convert any text to bytes
                if isinstance(content, str):
                        content = content.encode("utf-8")
@@ -44,9 +44,9 @@ class Nopaste(Object):
                                nopaste
                        (
                                uuid,
+                               account,
                                subject,
-                               content,
-                               time_expires,
+                               expires_at,
                                address,
                                mimetype,
                                size,
@@ -58,7 +58,7 @@ class Nopaste(Object):
                        )
                        RETURNING
                                *
-                       """, subject, content, expires or None, address, mimetype, len(content), blob_id,
+                       """, account.uid, subject, expires or None, address, mimetype, len(content), blob_id,
                )
 
                # Log result
@@ -195,6 +195,12 @@ class Paste(Object):
 
        time_expires = expires_at
 
+       # Account
+
+       @lazy_property
+       def account(self):
+               return self.backend.accounts.get_by_uid(self.data.account)
+
        # Blob
 
        @lazy_property

diff --git a/src/templates/nopaste/view.html b/src/templates/nopaste/view.html
index eaa8bde248f5f2c5aa055c16463d644d68c1fea6..13b4b73bfcaf55f8b40497f3e923c749aa0d2c0d 100644 (file)
--- a/src/templates/nopaste/view.html
+++ b/src/templates/nopaste/view.html
@@ -16,11 +16,13 @@
                                                </li>
                                        </ul>
                                </nav>
+
                                <h1 class="title">
                                        {{ entry.subject or _("Paste %s") % entry.uuid }}
                                </h1>
+
                                <h6 class="subtitle">
-                                       {{ _("Uploaded %s from %s") % (locale.format_date(entry.time_created), entry.address) }}
+                                       {{ _("Uploaded %s by %s") % (locale.format_date(entry.time_created), entry.account or "N/A") }}
                                </h6>
                        </div>
                </div>