Refind check for existing alias on server and in db

README.md

@@ -4,7 +4,7 @@ _malias_ is a helper for mailcow instances. You can create, delete, search and l
 
 ## Installation
 
-Download the latest release from https://gitlab.pm/rune/malias/releases. Unzip and move to a folder in you path (ease of use). I also recommend rename the file ```malias.py``` to just ```malias``` and make the file executable with ```chmod +x malias```. To install required python modules run ```pip3 install -r requirements.txt```
+Download the latest release from [https://gitlab.pm/rune/malias/releases](https://iurl.no/release). Unzip and move to a folder in you path (ease of use). I also recommend rename the file ```malias.py``` to just ```malias``` and make the file executable with ```chmod +x malias```. To install required python modules run ```pip3 install -r requirements.txt```
 
 ## Usage
 

malias.py

@@ -29,9 +29,26 @@ database = filepath.joinpath('malias.db')
 logfile = filepath.joinpath('malias.log')
 Path(filepath).mkdir(parents=True, exist_ok=True)
 logging.basicConfig(filename=logfile,level=logging.INFO,format='%(message)s')
-app_version = '0.2.3'
+app_version = '0.3.2'
 
 
+def get_latest_release():
+	req = urllib.request.Request('https://gitlab.pm/api/v1/repos/rune/malias/releases/latest')
+	req.add_header('Content-Type', 'application/json')
+	current = urllib.request.urlopen(req)
+	remote = current.read().decode('utf-8')
+	remoteData = json.loads(remote)
+	return remoteData['tag_name']
+
+
+def release_check():
+	latest_release = get_latest_release()
+	if app_version != latest_release:
+		print('[b]New version available @ [i]https://iurl.no/malias[/b][/i]')
+	else:
+		print ('You have the the latest version. Version: %s' %(app_version))
+		
+
 def connect_database():
 	Path(filepath).mkdir(parents=True, exist_ok=True)
 	conn = None
@@ -117,7 +134,6 @@ def set_mailserver(server):
 	print('Your mail server has been updated.')		
 	conn.commit()
 	
-	
 
 def apikey(key):
 	now = datetime.now().strftime("%m-%d-%Y %H:%M")
@@ -126,9 +142,9 @@ def apikey(key):
 	logging.info(now + ' - Info : API key updated')
 	print('Your API key has been updated.')		
 	conn.commit()
-	
 
-def get_mail_domains():
+
+def get_mail_domains(info):
 	apikey = get_api()
 	cursor = conn.cursor()
 	mail_server = get_settings('mail_server')
@@ -138,18 +154,21 @@ def get_mail_domains():
 	current = urllib.request.urlopen(req)
 	remote = current.read().decode('utf-8')
 	remoteData = json.loads(remote)
-	total_aliases = 0
-	i=0
-	print('\n[b]malias[/b] - All email domains on %s' %(mail_server))
-	print('==================================================================')
-	for domains in remoteData:
-		cursor.execute('SELECT count(*) FROM aliases where alias like ? or goto like ?', ('%'+remoteData[i]['domain_name']+'%','%'+remoteData[i]['domain_name']+'%',))
-		count = cursor.fetchone()[0]
-		total_aliases += count
-		print('%s \t\twith %s aliases' %(remoteData[i]['domain_name'],count))
-		i+=1
-	print('\n\nThere is a total of %s domains with %s aliases.' %(str(i),str(total_aliases)))
+	if info:
+		total_aliases = 0
+		i=0
+		print('\n[b]malias[/b] - All email domains on %s' %(mail_server))
+		print('==================================================================')
+		for domains in remoteData:
+			cursor.execute('SELECT count(*) FROM aliases where alias like ? or goto like ?', ('%'+remoteData[i]['domain_name']+'%','%'+remoteData[i]['domain_name']+'%',))
+			count = cursor.fetchone()[0]
+			total_aliases += count
+			print('%s \t\twith %s aliases' %(remoteData[i]['domain_name'],count))
+			i+=1
+		print('\n\nThere is a total of %s domains with %s aliases.' %(str(i),str(total_aliases)))
 
+	else:
+		return(remoteData)
 
 	
 def create(alias,to_address):
@@ -175,7 +194,7 @@ def create(alias,to_address):
 			conn.commit()
 			logging.info(now + ' - Info : alias %s created for %s on the mailcow instance %s ' %(alias,to_address,server))
 			print('\n[b]Info[/b] : alias %s created for %s on the mailcow instance %s \n' %(alias,to_address,server))
-			
+	
 	
 
 def delete_alias(alias):
@@ -208,6 +227,7 @@ def delete_alias(alias):
 
 
 
+
 def copy_data():
 	apikey = get_api()
 	mail_server = get_settings('mail_server')
@@ -230,8 +250,41 @@ def copy_data():
 		logging.info(now + ' - Info : aliases imported from the mailcow instance %s to local DB' %(mail_server))
 		print('\n[b]Info[/b] : aliases imported from the mailcow instance %s to local DB\n' %(mail_server))
 	else:
-		print('\n[b]Info[/b] : aliases alreday imported from the mailcow instance %s to local DB\n' %(mail_server))
-		
+		print('\n[b]Info[/b] : aliases alreday imported from the mailcow instance %s to local DB\n\n[i]Updating with any missing aliases![/i]' %(mail_server))
+		update_data()
+
+
+def update_data():
+	apikey = get_api()
+	mail_server = get_settings('mail_server')
+	if get_settings('copy_status') == 1:
+		now = datetime.now().strftime("%m-%d-%Y %H:%M")
+		cursor = conn.cursor()
+		req = urllib.request.Request('https://'+mail_server+'/api/v1/get/alias/all')
+		req.add_header('Content-Type', 'application/json')
+		req.add_header('X-API-Key', apikey)
+		current = urllib.request.urlopen(req)
+		remote = current.read().decode('utf-8')
+		remoteData = json.loads(remote)
+		i = 0
+		count_alias = 0
+		cursor = conn.cursor()
+		for data in remoteData:
+			cursor.execute('SELECT count(*) FROM aliases where alias like ? and goto like ?', (remoteData[i]['address'],remoteData[i]['goto'],))
+			count = cursor.fetchone()[0]
+			if count >= 1 :
+				i+=1
+			else:
+				cursor.execute('INSERT INTO aliases values(?,?,?,?)', (remoteData[i]['id'], remoteData[i]['address'],remoteData[i]['goto'],now))
+				count_alias+=1
+				i+=1
+		conn.commit()
+		if count_alias > 0:
+			logging.info(now + ' - Info : Local DB updated with %s new aliases from %s ' %(str(count_alias),mail_server))
+			print('\n[b]Info[/b] : Local DB update with %s new aliases from %s \n' %(str(count_alias),mail_server))
+		else:
+			print('\n[b]Info[/b] : No missing aliases from local DB \n')
+
 
 def checklist(alias):
 	alias_exist = None
@@ -245,11 +298,11 @@ def checklist(alias):
 	remoteData = json.loads(remote)
 	i = 0
 	for search in remoteData:
-		if alias in remoteData[i]['address'] or alias in remoteData[i]['goto']:
+		if alias == remoteData[i]['address'] or alias == remoteData[i]['goto']:
 			alias_exist = True
 		i=i+1
 	cursor = conn.cursor()
-	cursor.execute('SELECT count(*) FROM aliases where alias like ? or goto like ?', (alias,alias,))
+	cursor.execute('SELECT count(*) FROM aliases where alias == ? or goto == ?', (alias,alias,))
 	count = cursor.fetchone()[0]
 	if count >= 1 :
 		alias_exist = True
@@ -283,8 +336,7 @@ def list_alias():
 			print(the_alias + '\tgoes to\t\t' + the_goto)
 		i=i+1
 	print('\n\nTotal number of aliases %s on instance [b]%s[/b] and %s on [b]local DB[/b].' %(str(i),mail_server,str(l)))
-	
-	
+
 
 def alias_id(alias):
 	apikey = get_api()
@@ -331,10 +383,11 @@ def check_local_db(alias_id):
 
 	
 
-
 def search(alias):
 	apikey = get_api()
 	mail_server = get_settings('mail_server')
+	alias_server = number_of_aliases_on_server()
+	alias_db = number_of_aliases_in_db()
 	cursor = conn.cursor()
 	cursor.execute('SELECT data_copy FROM settings where id = 1')
 	result = cursor.fetchone()[0]
@@ -343,13 +396,14 @@ def search(alias):
 		cursor.execute('SELECT * from aliases where alias like ? or goto like ?',(search_term,search_term,))
 		remoteData = cursor.fetchall()
 		i = 0
-		print('\nAliases on %s that contains %s' %(mail_server,alias))
+		print('\nAliases on %s that contains [b]%s[/b]' %(mail_server,alias))
 		print('=================================================================')
 		for search in remoteData:
 			the_alias = remoteData[i][1].ljust(20,' ')
 			print(the_alias + '\tgoes to\t\t' + remoteData[i][2])
 			i=i+1
 		print('\n\nData from local DB')
+
 	else:
 		req = urllib.request.Request('https://'+mail_server+'/api/v1/get/alias/all')
 		req.add_header('Content-Type', 'application/json')
@@ -358,15 +412,18 @@ def search(alias):
 		remote = current.read().decode('utf-8')
 		remoteData = json.loads(remote)
 		i = 0
-		print('\nAliases on %s that contains %s' %(mail_server,alias))
+		print('\nAliases on %s that contains [b]%s[/b]' %(mail_server,alias))
 		print('=================================================')
 		for search in remoteData:
 			if alias in remoteData[i]['address'] or alias in remoteData[i]['goto']:
 				print(remoteData[i]['address'] + '\tgoes to\t\t' + remoteData[i]['goto'])
 			i=i+1
 		print('\n\nData from server')
+	if alias_server != alias_db:
+		print('\n\nThere are %s aliases on the server and %s aliases in local DB' %(str(alias_server),str(alias_db)))
+		print('Run [i]malias -c[/i] to update local DB')
 
-
+	
 def get_mailcow_version():
 	apikey = get_api()
 	mail_server = get_settings('mail_server')
@@ -376,27 +433,23 @@ def get_mailcow_version():
 	current = urllib.request.urlopen(req)
 	remote = current.read().decode('utf-8')
 	remoteData = json.loads(remote)
-	#repo = Repo("https://github.com/mailcow/mailcow-dockerized")
-	# info = repo.git.ls_remote()
-	# tags = repo.tags
 	remote_heads = git.cmd.Git().ls_remote('https://github.com/mailcow/mailcow-dockerized', tags=True)
-	# tags = remote_heads.rstrip('refs/tags/')
 	tags = remote_heads.splitlines()
 	for x in tags:
 		string = x.rsplit('/',2)
-		
+	
 	if remoteData['version'] != string[2]:
 		versionInfo = 'Your Mailcow version is %s and the latest is %s' %(remoteData['version'], string[2])
 	else:
 		versionInfo = 'You have the latest Mailcow version %s' %remoteData['version']
-		
+	
 	return (versionInfo)
-
-
+	
+				
 def show_current_info():
 	API = get_api()
 	mail_server = get_settings('mail_server')	
-	
+	latest_release = get_latest_release()
 	if API == 'DUMMY_KEY':
 		API = 'Missing API Key!'
 	
@@ -406,18 +459,30 @@ def show_current_info():
 	aliases_server = number_of_aliases_on_server()
 	alias_db = number_of_aliases_in_db()
 	mailcow_version = get_mailcow_version()
-	
+	mail_domains = get_mail_domains(False)
+	domain = ""
+	i=0
+	for domains in mail_domains:
+		if i!=0:
+			domain = domain + ', ' + str(mail_domains[i]['domain_name'])
+		else:
+			domain = domain + str(mail_domains[i]['domain_name'])
+		i+=1
 	print('\n[b]malias[/b] - Manage aliases on mailcow Instance.')
 	print('===================================================')
 	print('API key 		: [b]%s[/b]' % (API))
-	print('mailcow Instance 	: [b]%s[/b]' % (mail_server))
+	print('Mailcow Instance 	: [b]%s[/b]' % (mail_server))
+	print('Active domains		: [b]%s[/b]' % (domain))
 	print('Mailcow version 	: [b]%s[/b]' % (mailcow_version))
 	print('Logfile 		: [b]%s[/b]' % (logfile))
 	print('Databse 		: [b]%s[b]' % (database))
 	print('Aliases on server 	: [b]%s[/b]' % (aliases_server))
 	print('Aliases in DB 		: [b]%s[/b]' % (alias_db))
 	print('')
-	print('App version 		: [b]%s[/b] (https://gitlab.pm/rune/malias)' % (app_version))
+	if app_version != latest_release:
+		print('App version 		: [b]%s[/b] a new version (%s) is available @ https://iurl.no/malias' % (app_version,latest_release))
+	else:
+		print('App version 		: [b]%s[/b]' % (app_version))
 	print('')
 	
 	
@@ -446,7 +511,10 @@ parser.add_argument('-d', '--delete', help='Delete alias.\n\n',
 	nargs=1, metavar=('alias@domain.com'), required=False, action="append")
 
 
-parser.add_argument('-i', '--info', help='Show current version and config info\n\n',
+parser.add_argument('-i', '--info', help='Show current config and appliacation info\n\n',
+					required=False, action='store_true')
+
+parser.add_argument('-v', '--version', help='Show current version\n\n',
 					required=False, action='store_true')
 
 parser.add_argument('-c', '--copy', help='Copy alias data from mailcow server to local DB.\n\n',
@@ -473,14 +541,16 @@ elif args['delete']:
 	delete_alias(args['delete'][0][0])
 elif args['info']:
 	show_current_info()
+elif args['version']:
+	release_check()
 elif args['copy']:
 	copy_data()
 elif args['list']:
 	list_alias()
 elif args['domains']:
-	get_mail_domains()
+	get_mail_domains(True)
 		
 	
 else:
-	#get_mailcow_version()
+	# get_api()
 	print('\n\nEh, sorry! I need something more to help you! If you write [b]malias -h[/b] I\'ll show a help screen to get you going!!!\n\n\n')