v.1.1.7.3 update

Author: drlight17

CHANGES.md

@@ -6,7 +6,13 @@ Unreleased VER.
 - remove python privex helpers code (?)
 - save settings into cookies + accept cookies modal (?)
 - export to xlsx file (table) (?)
+- fix dropdown update if use fomantic ui div based dropdown
 
+
+VER. 1.1.7.3
+- ~~BUG: postfix queue ID length may not be equal to 10 symbols~~
+- ~~BUG: exim wrong parsing mail_to for some bounces ~~
+- ~~add DLR developed logo in footer~~
 VER. 1.1.7.2
 - ~~BUG: log_lines filter outputs the same id emails (only exim?)~~
 - ~~BUG: dark mode filling text search with black font color instead of white~~

mlp/main.py

@@ -35,12 +35,13 @@
 
 # !!! change version upon update !!!
 global VERSION
-VERSION ="1.1.7.2"
+VERSION ="1.1.7.3"
 
 # postfix regexp
 postf_match = r'([A-Za-z]+[ \t]+[0-9]+[ \t]+[0-9]+\:[0-9]+:[0-9]+).*'
 """(0) Regex to match the Date/Time at the start of each log line"""
-postf_match += r'([A-F0-9]{11})\:[ \t]+?(.*)'
+# postf_match += r'([A-F0-9]{11})\:[ \t]+?(.*)'
+postf_match += r'\:[ \t]([A-F0-9]{1,15})\:[ \t]+?(.*)'
 """Regex to match the (1) Queue ID and the (2) Log Message"""
 
 # exim regexp (for syslog and separate mainlog)
@@ -144,40 +145,45 @@ async def import_log(logfile: str) -> Dict[str, PostfixMessage]:
     # avoid utf-8 codec error
     with open(logfile, 'rb') as f:
         while True:
+
             line = f.readline().decode(errors='replace')
             if not line: break
 
             m = match.match(line)
+
             if not m: continue
 
             dtime, qid, msg = m.groups()
             """Thu Mar 09 2023 14:13:35 GMT+00:00    ----     '%a %b %d %Y %H:%M:%S %Z' """
             """Mar 13 10:57:04
             dtime = datetime.strptime(dtime, '%b %d %H:%M:%S').replace(year=datetime.today().year).strftime('%d.%m.%Y-%H:%M:%S')
             print("New time stamp: "+ dtime)"""
+            #log.info(m)
             #print("m.groups[1]: ",m.groups()[1])# - queue_id
             #print("m.groups[2]: ",m.groups()[2])# - message
             # merge multiple mail_to strings into one for the one queue_id
 
                 #m['mail_to'] += ", "+recipients
                 #print("mail_to: ",m['mail_to'])
-                
+            #print("mail_to: ",m['mail_to'])
             if qid not in messages:
                 messages[qid] = PostfixMessage(timestamp=dtime, queue_id=qid)
             messages[qid].merge(await parse_line(msg))
-
-            cheking_mailto = messages[qid]['mail_to']
+            #print(messages[qid])
+            #print(msg)
+            checking_mailto = messages[qid]['mail_to']
             if qid not in set(multiple_recipients):
-                if qid == same_qid or same_qid=='':
+                if qid == same_qid or same_qid == '':
                     if messages[qid]['status'].get('code') is not None:
-                        # check if there are already recipients in message
-                        #print("Looking for ",cheking_mailto," in message '",msg, "' related to qid ", qid)
-                        if cheking_mailto in msg:
-                            same_qid = qid
-                            counter += 1
+                        # check if there are already recipients in message and there are recipients parsed
+                        #print("Looking for ",checking_mailto," in message \"",msg, "\" related to qid ", qid)
+                        if checking_mailto != '':
+                            if checking_mailto in msg:
+                                same_qid = qid
+                                counter += 1
                 else:
                     #print("New message ID: ", qid)
-                    #print("There are ", counter," recipients in message ",same_qid)
+                    #print("There are", counter,"recipients in message id",same_qid)
                     if counter > 1:
                         multiple_recipients.append(same_qid)
                     counter = 0
@@ -239,6 +245,7 @@ async def main():
     r, conn, r_q = await get_rethink()
     r_q: rethinkdb.query
     """housekeeping from old logs"""
+
     housekeeping_days = settings.housekeeping_days
     if housekeeping_days != '':
         log.info('Start housekeeping')
@@ -301,7 +308,7 @@ async def main():
                 continue
             # check if there are many recipients
             if m.get('id') in set(multiple_recipients):
-                #print("There multiple recipients in ",m.get('id'))
+                print("There multiple recipients in ",m.get('id'))
                 m['mail_to'] += " and more (check log lines)"
                 m['status']['code'] = 'multiple'
                 m['status']['message'] = 'multiple, see log lines below'

mlp/parser.py

@@ -33,6 +33,7 @@
 # exim regexp
 exim_to = re.compile(r'.*>.(.*).R=')
 exim_from = re.compile(r'.*<=.(.*).H=|.*F=<(.*)>')
+#exim_from = re.compile(r'.*<=.(.*).H=|.*F=<(.*)>|.*\*\*.(.*).R=')
 exim_subject = re.compile(r'.*Subject:\s(.*)')
 exim_size = re.compile(r'.*S=([0-9]{1,}).*')
 exim_message_id = re.compile(r'.*<=.*id=(.*)')
@@ -94,7 +95,7 @@ async def parse_line(mline) -> dict:
     _client = find_client.match(mline)
     _relay = find_relay.match(mline)
     _status = find_status.match(mline)
-
+    
     if _to is not None: lm['mail_to'] = _to.group(1)
     if _subject is not None: lm['subject'] = _subject.group(1)
     if _size is not None: lm['size'] = round(float(_size.group(1))/1024, 2)

mlp/static/css/style.css

@@ -14,6 +14,19 @@
 #app.dark .ui.inverted.segment, .ui.inverted.segments .segment, .ui.primary.inverted.segment {
     background: #2b2b2b;
 }
+#app.dark .developed_by {
+	filter: brightness(1);
+}
+.developed_by {
+	display: inline;
+    height: 55px;
+	opacity: .7;
+    filter: brightness(0);
+    /*position: absolute;
+    right: 0px;
+    top: 5px;
+    margin-right: 10px;*/
+}
 
 /*#app.dark #emails_list > div.top_title > div.logo > div.field.wrapper, #app.dark div.logo.login {
     filter: invert(1);
@@ -359,6 +372,8 @@ summary {
 /*all buttons except ui.buttons div*/
 button:not(.navi), #footer {
     width:100%;
+	display: flex;
+	justify-content: space-between;
 }
 /* fix of calendar z-index over modals*/
 .ui.popup {

mlp/static/images/developed_by_drlight.png

@@ -72,15 +72,19 @@
         {% block content %}{% endblock %}
 
         <div v-if="!loading" class="ui segment" id="footer">
-            <span v-if="localeData.footer.two" v-html="localeData.footer.two"></span>
-            <span v-else v-html="fallbackLocaleData.footer.two"></span>
-            {{ VERSION }}
-            <span v-if="localeData.footer.three" v-html="localeData.footer.three"></span>
-            <span v-else v-html="fallbackLocaleData.footer.three"></span>
-            <br>
-            <span style="opacity:.5;" v-if="localeData.footer.one" v-html="localeData.footer.one"></span>
-            <span style="opacity:.5;" v-else v-html="fallbackLocaleData.footer.one"></span>
-            
+			<div>
+				<span v-if="localeData.footer.two" v-html="localeData.footer.two"></span>
+				<span v-else v-html="fallbackLocaleData.footer.two"></span>
+				{{ VERSION }}
+				<span v-if="localeData.footer.three" v-html="localeData.footer.three"></span>
+				<span v-else v-html="fallbackLocaleData.footer.three"></span>
+				<br>
+				<span style="opacity:.5;" v-if="localeData.footer.one" v-html="localeData.footer.one"></span>
+				<span style="opacity:.5;" v-else v-html="fallbackLocaleData.footer.one"></span>
+			</div>
+            <a target="_blank" href="https://github.com/drlight17">
+				<img class="developed_by" src="{{ url_for('static', filename='images/developed_by_drlight.png') }}" />
+			</a>
         </div>
     </div>
 

mlp/templates/base.html

@@ -185,7 +185,8 @@ async def api_emails():
         search_string = str(frm.pop('mail_to'))#.lower()
         recipient_match = ''
         if settings.mta == 'exim':
-            recipient_match = "-> |=> |== |>> "
+            recipient_match = "** |-> |=> |== |>> "
+            #recipient_match = "-> |=> |== |>> "
             #recipient_match = "->|=>|==|>> "
         if settings.mta == 'sendmail' or settings.mta == 'postfix':
             recipient_match = "^to="