Merge branch 'master' of github.com:HaschekSolutions/opentrashmail

HaschekSolutions · Nov 12, 2023 · 0de5e06 · 0de5e06
2 parents 4b090d9 + dcc1889
commit 0de5e06
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -9,8 +9,9 @@
 
 <div align="center">
 
-![](https://img.shields.io/badge/php-7.1%2B-brightgreen.svg)
+![](https://img.shields.io/badge/php-7%2B-brightgreen.svg)
 ![](https://img.shields.io/badge/python-2.7%2B-brightgreen.svg)
+![](https://img.shields.io/badge/made%20with-htmx-brightgreen.svg)
 [![](https://img.shields.io/docker/pulls/hascheksolutions/opentrashmail?color=brightgreen)](https://hub.docker.com/r/hascheksolutions/opentrashmail)
 [![](https://github.com/hascheksolutions/opentrashmail/actions/workflows/build-docker.yml/badge.svg?color=brightgreen)](https://github.com/HaschekSolutions/opentrashmail/actions)
 [![Apache License](https://img.shields.io/badge/license-Apache-blue.svg?style=flat)](https://github.com/HaschekSolutions/opentrashmail/blob/master/LICENSE)
@@ -34,13 +35,23 @@
 - 100% file based, no database needed
 - Can be used as Email Honeypot
 
+# General API calls and functions
+
+| Endpoint                   | Explanation                                                                                                                                                                                           | Example output                   |
+|----------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------|
+| /rss/`[email-address]`     | Renders RSS XML for rss clients to render emails | [![](https://pictshare.net/ysu5qp.png)](https://pictshare.net/ysu5qp.png) |
+| /api/raw/`[email-address]/[id]`     | Returns the raw email of the address. Warning: Output can be as large as the email itself so might be up to 20mb for mails with large attachments | [![](https://pictshare.net/pkb49p.png)](https://pictshare.net/pkb49p.png) |
+| /api/attachment`[email-address]/[attachment-id]` | Returns the attachment with the correct mime type as header | |
+| /api/delete/`[email-address]/[id]`  | Deletes a specific email message and their attachments | |
+| /api/deleteaccount/`[email-address]`| Deletes all messages and attachments of this email account | |
+
 # JSON API
 
 | Endpoint                   | Explanation                                                                                                                                                                                           | Example output                   |
 |----------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------|
-| /json/`[email-address]`      | Returns an array of received emails with links to the attachments and the parsed text based body of the email. If `ADMIN` email is entered, will return all emails of all accounts                    | [![](https://pictshare.net/100x100/sflw6t.png)](https://pictshare.net/sflw6t.png) |
-| /json/`[email-address]/[id]` | To see all the data of a received email, take the ID from the previous call and poll this to get the raw and HTML body of the email. Can be huge since the body can contain all attachments in base64 | [![](https://pictshare.net/100x100/eltku4.png)](https://pictshare.net/eltku4.png) |
-| /json/listaccounts         | If `SHOW_ACCOUNT_LIST` is set to true in the config.ini, this endpoint will return an array of all email addresses which have received at least one email                                             | [![](https://pictshare.net/100x100/u6agji.png)](https://pictshare.net/u6agji.png) |
+| /json/`[email-address]`       | Returns an array of received emails with links to the attachments and the parsed text based body of the email. If `ADMIN` email is entered, will return all emails of all accounts                    | [![](https://pictshare.net/100x100/sflw6t.png)](https://pictshare.net/sflw6t.png) |
+| /json/`[email-address]/[id]`  | To see all the data of a received email, take the ID from the previous call and poll this to get the raw and HTML body of the email. Can be huge since the body can contain all attachments in base64 | [![](https://pictshare.net/100x100/eltku4.png)](https://pictshare.net/eltku4.png) |
+| /json/listaccounts            | If `SHOW_ACCOUNT_LIST` is set to true in the config.ini, this endpoint will return an array of all email addresses which have received at least one email                                             | [![](https://pictshare.net/100x100/u6agji.png)](https://pictshare.net/u6agji.png) |
 
 
 # Configuration

diff --git a/web/inc/OpenTrashmailBackend.class.php b/web/inc/OpenTrashmailBackend.class.php
@@ -32,7 +32,6 @@ public function run(){
                     return $this->deleteMail($_REQUEST['email']?:$this->url[2],$_REQUEST['id']?:$this->url[3]);
                 case 'random':
                     $addr = generateRandomEmail();
-                    //add header HX-Redirect
                     return $this->listAccount($addr);
                 case 'deleteaccount':
                     return $this->deleteAccount($_REQUEST['email']?:$this->url[2]);
@@ -80,7 +79,7 @@ public function run(){
                     http_response_code(404);
                     exit(json_encode(['error'=>'Email ID not found']));
                 }
-                else if(!ctype_digit($id))
+                else if(!is_numeric($id))
                 {
                     http_response_code(400);
                     exit(json_encode(['error'=>'Invalid ID']));
@@ -117,7 +116,7 @@ function deleteMail($email,$id)
     {
         if(!filter_var($email, FILTER_VALIDATE_EMAIL))
             return $this->error('Invalid email address');
-        else if(!ctype_digit($id))
+        else if(!is_numeric($id))
             return $this->error('Invalid id');
         else if(!emailIDExists($email,$id))
             return $this->error('Email not found');
@@ -129,7 +128,7 @@ function getRawMail($email,$id,$htmlbody=false)
     {
         if(!filter_var($email, FILTER_VALIDATE_EMAIL))
             return $this->error('Invalid email address');
-        else if(!ctype_digit($id))
+        else if(!is_numeric($id))
             return $this->error('Invalid id');
         else if(!emailIDExists($email,$id))
             return $this->error('Email not found');
@@ -147,7 +146,7 @@ function getAttachment($email,$attachment)
         $attachment = substr($attachment,14);
         if(!filter_var($email, FILTER_VALIDATE_EMAIL))
             return $this->error('Invalid email address');
-        else if(!ctype_digit($id))
+        else if(!is_numeric($id))
             return $this->error('Invalid id');
         else if(!emailIDExists($email,$id))
             return $this->error('Email not found');
@@ -166,7 +165,7 @@ function readMail($email,$id)
     {
         if(!filter_var($email, FILTER_VALIDATE_EMAIL))
             return $this->error('Invalid email address');
-        else if(!ctype_digit($id))
+        else if(!is_numeric($id))
             return $this->error('Invalid id');
         else if(!emailIDExists($email,$id))
             return $this->error('Email not found');
@@ -191,6 +190,7 @@ public function listAccount($email)
         $emails = getEmailsOfEmail($email);
         //var_dump($emails);
         return $this->renderTemplate('email-table.html',[
+            'isadmin'=>($this->settings['ADMIN']==$email),
             'email'=>$email,
             'emails'=>$emails,
             'dateformat'=>$this->settings['DATEFORMAT']

diff --git a/web/templates/email-table.html.php b/web/templates/email-table.html.php
@@ -18,6 +18,7 @@
       <th scope="col">#</th>
       <th scope="col">Date</th>
       <th scope="col">From</th>
+      <?php if($isadmin==true): ?><th scope="col">To</th><?php endif; ?>
       <th scope="col">Subject</th>
       <th scope="col">Action</th>
     </tr>
@@ -35,10 +36,16 @@
             <th scope="row"><?= ++$i; ?></th>
             <td id="date-td-<?= $i ?>"><script>document.getElementById('date-td-<?= $i ?>').innerHTML = moment.unix(parseInt(<?=$unixtime?>/1000)).format('<?= $dateformat; ?>');</script></td>
             <td><?= escape($ed['from']) ?></td>
+            <?php if($isadmin==true): ?><td><?= $ed['email'] ?></td><?php endif; ?>
             <td><?= escape($ed['subject']) ?></td>
             <td>
+              <?php if($isadmin==true): ?>
+                  <a href="/read/<?= $ed['email'] ?>/<?= $ed['id'] ?>" hx-get="/api/read/<?= $ed['email'] ?>/<?= $ed['id'] ?>" hx-push-url="/read/<?= $ed['email'] ?>/<?= $ed['id'] ?>" hx-target="#main" role="button">Open</a>
+                  <a href="#" hx-get="/api/delete/<?= $ed['email'] ?>/<?= $ed['id'] ?>" hx-confirm="Are you sure?" hx-target="closest tr" hx-swap="outerHTML swap:1s" role="button">Delete</a>
+              <?php else: ?>
                   <a href="/read/<?= $email ?>/<?= $ed['id'] ?>" hx-get="/api/read/<?= $email ?>/<?= $ed['id'] ?>" hx-push-url="/read/<?= $email ?>/<?= $ed['id'] ?>" hx-target="#main" role="button">Open</a>
                   <a href="#" hx-get="/api/delete/<?= $email ?>/<?= $ed['id'] ?>" hx-confirm="Are you sure?" hx-target="closest tr" hx-swap="outerHTML swap:1s" role="button">Delete</a>
+              <?php endif; ?>
             </td>
         </tr>
     <?php endforeach; ?>

diff --git a/web/templates/index.html.php b/web/templates/index.html.php
@@ -29,8 +29,6 @@
   </main>
 
   <script src="/js/htmx.min.js"></script>
-  <script src="/js/namegenerator.js"></script>
-  <!-- <script src="/js/opentrashmail.js"></script> -->
   <script src="/js/moment-with-locales.min.js"></script>
 </body>