Quick fix

README.md

@@ -4,7 +4,7 @@ _DDNS_ is a dynamic DNS helper for Digital Ocean users to utilize their DO accou
 
 ## Installation
 
-Download the latest relase from https://gitlab.pm/rune/ddns/releases. Unzip and move to a folder in you path (ease of use). You can alos rename the file ```ddns.py``` to just ```ddns``` and make the file executable with ```chmod +x ddns```. To install required python modules run ```pip3 -r requirements.txt```
+Download the latest relase from https://gitlab.pm/rune/ddns/releases. Unzip and move to a folder in you path (ease of use). You can also rename the file ```ddns.py``` to just ```ddns``` and make the file executable with ```chmod +x ddns```. To install required python modules run ```pip3 install -r requirements.txt```
 
 ## Usage
 
@@ -27,7 +27,7 @@ to discuss what you would like to change.
 
 ## Support
 
-If you found a bug or you have sugestion for new features create an issue.
+If you found a bug or you have suggestion for new features create an issue.
 
 ## Future development
 

ddns.py

@@ -18,8 +18,8 @@ homefilepath = Path.home()
 filepath = homefilepath.joinpath('.config/ddns')
 database = filepath.joinpath('ddns.db')
 logfile = filepath.joinpath('ddns.log')
-logging.basicConfig(filename=logfile,level=logging.INFO)
+logging.basicConfig(filename=logfile,level=logging.INFO,format='%(message)s')
-app_version = '0.4.2.1'
+app_version = '0.5.2'
 
 
 def get_ip():
@@ -125,10 +125,14 @@ def add_domian(domain):
 
 def add_subdomain(domain):
 	now = datetime.now().strftime("%Y-%m-%d %H:%M")
-	if set(domain).difference(ascii_letters + '.' + digits):
+	if set(domain).difference(ascii_letters + '.' + digits + '-' + '@'):
 		print('[red]Error:[/red] Give the domain name in simple form e.g. [b]test.domain.com[/b]')
 	else:
 		parts = domain.split('.')
+		if len(parts) > 3:
+			top = parts[1] + '.' + parts[2] + '.' + parts[3]
+			sub = parts[0]
+		else:
 			sub = parts[0]
 			top = parts[1] + '.' + parts[2]
 		apikey = get_api()
@@ -145,9 +149,10 @@ def add_subdomain(domain):
 				if count == 0:
 					print('[red]Error:[/red] Top domain [bold]%s[/bold] does not exist in the DB. Please add it with [i]ddns -t %s[/i].' % (top,top))
 				else:
-					cursor.execute('SELECT id FROM domains WHERE name LIKE ?',(top,))
+					cursor.execute('SELECT id,name FROM domains WHERE name LIKE ?',(top,))
-					topdomain_id = cursor.fetchone()
+					topdomain = cursor.fetchone()
-					topdomain_id = topdomain_id[0]
+					topdomain_id = topdomain[0]
+					topdomain_name = topdomain[1]
 					cursor.execute('SELECT count(*) FROM subdomains WHERE main_id LIKE ? AND name like ?',(topdomain_id,sub,))
 					count = cursor.fetchone()[0]
 					if count != 0:
@@ -161,7 +166,7 @@ def add_subdomain(domain):
 							if response != 'Fail':
 								response_data = response.json()
 								domainid = str(response_data['domain_record']['id'])
-								cursor.execute('INSERT INTO subdomains values(?,?,?,?,?,?,?,?)',(domainid,topdomain_id,sub,ip,None,now,now,now,))
+								cursor.execute('INSERT INTO subdomains values(?,?,?,?,?,?,?,?,?)',(domainid,topdomain_id,sub,ip,None,now,now,now,1,))
 								conn.commit()
 								print('The domain %s has been added.' % (domain))
 								logging.info(time.strftime("%Y-%m-%d %H:%M") + ' - Info : subdomain %s added'%(domain))
@@ -170,19 +175,24 @@ def add_subdomain(domain):
 
 
 def remove_subdomain(domain):
-	if set(domain).difference(ascii_letters + '.' + digits):
+	if set(domain).difference(ascii_letters + '.' + digits + '-' + '@'):
 		print('[red]Error:[/red] Give the domain name in simple form e.g. [b]test.domain.com[/b]')
 	else:
 		parts = domain.split('.')
+		if len(parts) > 3:
+			top = parts[1] + '.' + parts[2] + '.' + parts[3]
+			sub = parts[0]
+		else:
 			sub = parts[0]
 			top = parts[1] + '.' + parts[2]
+		longtop=sub+'.'+top	
 		cursor = conn.cursor()
-		cursor.execute('SELECT COUNT(*) FROM domains WHERE name like ?',(top,))
+		cursor.execute('SELECT COUNT(*) FROM domains WHERE name like ? or name like ?',(top,longtop,))
 		count = cursor.fetchone()[0]
 		if count == 0:
 			print('[red]Error:[/red] Top domain [bold]%s[/bold] does not exist in the DB. So I\'m giving up!.' % (top))
 		else:
-			cursor.execute('SELECT COUNT(*) FROM subdomains WHERE name like ? and main_id=(SELECT id from domains WHERE name=?)',(sub,top,))
+			cursor.execute('SELECT COUNT(*) FROM subdomains WHERE name like ? and main_id=(SELECT id from domains WHERE name like ? or name like ?)',(sub,top,longtop,))
 			count = cursor.fetchone()[0]
 			if count == 0:
 				print('[red]Error:[/red] Domain [bold]%s[/bold] does not exist in the DB. So I\'m giving up!.' % (domain))
@@ -191,7 +201,7 @@ def remove_subdomain(domain):
 				if apikey == None:
 					print("[red]Error:[/red] Missing APIkey. Please add one!")
 				else:
-					cursor.execute('SELECT id FROM subdomains WHERE name like ? and main_id=(SELECT id from domains WHERE name=?)',(sub,top,))
+					cursor.execute('SELECT id FROM subdomains WHERE name like ? and main_id=(SELECT id from domains WHERE name like ? or name like ?)',(sub,top,longtop,))
 					subdomain_id = str(cursor.fetchone()[0])
 					headers = {'Authorization': 'Bearer ' + apikey, "Content-Type": "application/json"}
 					response = requests.delete('https://api.digitalocean.com/v2/domains/'+top+'/records/' + subdomain_id, headers=headers)
@@ -204,6 +214,48 @@ def remove_subdomain(domain):
 
 
 
+def edit_subdomain(domain):
+	if set(domain).difference(ascii_letters + '.' + digits + '-' + '@'):
+		print('[red]Error:[/red] Give the domain name in simple form e.g. [b]test.domain.com[/b]')
+	else:
+		parts = domain.split('.')
+		if len(parts) > 3:
+			top = parts[1] + '.' + parts[2] + '.' + parts[3]
+			sub = parts[0]
+		else:
+			sub = parts[0]
+			top = parts[1] + '.' + parts[2]
+		longtop=sub+'.'+top
+		cursor = conn.cursor()
+		cursor.execute('SELECT COUNT(*) FROM domains WHERE name like ? or name like ?',(top,longtop,))
+		count = cursor.fetchone()[0]
+		if count == 0:
+			print('[red]Error:[/red] Top domain [bold]%s[/bold] does not exist in the DB. So I\'m giving up!.' % (top))
+		else:
+			cursor.execute('SELECT COUNT(*) FROM subdomains WHERE name like ? and main_id=(SELECT id from domains WHERE name like ? or name like ?)',(sub,top,longtop))
+			count = cursor.fetchone()[0]
+			if count == 0:
+				print('[red]Error:[/red] Domain [bold]%s[/bold] does not exist in the DB. So I\'m giving up!.' % (domain))
+			else:
+				apikey = get_api()
+				if apikey == None:
+					print("[red]Error:[/red] Missing APIkey. Please add one!")
+				else:
+					cursor.execute('SELECT id,active FROM subdomains WHERE name like ? and main_id=(SELECT id from domains WHERE name like ? or name like ?)',(sub,top,longtop))
+					domain_info = cursor.fetchone()
+					subdomain_id = str(domain_info[0])
+					status = domain_info[1]
+					if status == 1:
+						status = 0
+					else:
+						status = 1
+					cursor.execute('UPDATE subdomains SET active = ? WHERE id = ?',(status,subdomain_id,))
+					logging.info(time.strftime("%Y-%m-%d %H:%M") + ' - Info : Status for domain %s changed' %(domain))
+					print('Status for domain %s changed' %(domain))
+					conn.commit()
+					
+
+
 def show_all_top_domains():
 	cursor = conn.cursor()
 	apikey = get_api()
@@ -241,8 +293,8 @@ def list_sub_domains(domain):
 			print("[red]Error: [/red]No such domain. Check spelling or use ddns -d to show all top domains.")
 		else:
 			print('\n\nCurrent sub domains for [b]%s[/b]\n\n' % (domain))
-			print('Domain\t\t\t\tCreated\t\t\tUpdated\t\t\tChecked')
+			print('Domain\t\t\t\tCreated\t\t\tUpdated\t\t\tChecked\t\t\tActive')
-			print('===============================================================================================')
+			print('==================================================================================================================')
 			cursor.execute('SELECT id FROM domains WHERE name LIKE ?', (domain,))
 			topdomain_id = cursor.fetchone()[0]
 			cursor.execute('SELECT COUNT(*) FROM subdomains WHERE main_id LIKE ?',(topdomain_id,))
@@ -250,12 +302,16 @@ def list_sub_domains(domain):
 			if count == 0:
 				print('[red]Error:[/red] No sub domains for [b]%s[/b]' % (domain))
 			else:
-				cursor.execute('SELECT name,last_updated,last_checked,created FROM subdomains WHERE main_id LIKE ?',(topdomain_id,) )
+				cursor.execute('SELECT name,last_updated,last_checked,created,active FROM subdomains WHERE main_id LIKE ?',(topdomain_id,) )
 				subdomains = cursor.fetchall()
 				for i in subdomains:
+					if i[4] == 1:
+						active = 'True'
+					else:
+						active = 'False'
 					topdomain = i[0]+'.'+domain
 					topdomain = "{:<25}".format(topdomain)
-					print(topdomain+'\t'+i[3]+'\t'+i[1]+'\t'+i[2])
+					print(topdomain+'\t'+i[3]+'\t'+i[1]+'\t'+i[2]+'\t'+active)
 			print('\n')
 
 
@@ -288,12 +344,17 @@ def domaininfo(domain):
 	apikey = get_api()
 	local_ip = get_ip()
 	cursor = conn.cursor()
-	if set(domain).difference(ascii_letters + '.'):
+	if set(domain).difference(ascii_letters + '.' + digits + '@' + '-'):
 		print('[red]Error:[/red]. Give the domain name in simple form e.g. [bold]test.domain.com[/bold]')
 	else:
 		parts = domain.split('.')
-		topdomain = parts[1]+'.'+parts[2]
+		if len(parts) > 3:
-		cursor.execute('SELECT id FROM domains WHERE name like ?', (topdomain,))
+			top = parts[1] + '.' + parts[2] + '.' + parts[3]
+			sub = parts[0]
+		else:
+			sub = parts[0]
+			top = parts[1] + '.' + parts[2]
+		cursor.execute('SELECT id FROM domains WHERE name like ?', (top,))
 		domainid = cursor.fetchone()[0]
 		cursor.execute('SELECT * FROM subdomains WHERE main_id like ?', (domainid,))
 		domains = cursor.fetchall()
@@ -383,13 +444,16 @@ def updateip(force):
 		print('[red]Error: [/red]There are no dynamic domains active.'\
 			' Start by adding a new domain with [i]ddns -s test.example.com[/i]')
 	else:
-		cursor.execute('SELECT id FROM subdomains')
+		cursor.execute('SELECT id,active FROM subdomains')
 		rows = cursor.fetchall()
 		for i in rows:
 			cursor.execute('SELECT name FROM domains WHERE id like (SELECT main_id from subdomains WHERE id = ?)',(i[0],))
-			domain_name = str(cursor.fetchone()[0])
+			domain_info = cursor.fetchone()
+			domain_name = str(domain_info[0])
+			domain_status = i[1]
 			subdomain_id = str(i[0])
 			# Chek if an update is required
+			if domain_status == 1:
 				req = urllib.request.Request('https://api.digitalocean.com/v2/domains/' + domain_name + '/records/' + subdomain_id)
 				req.add_header('Content-Type', 'application/json')
 				req.add_header('Authorization', 'Bearer ' + apikey)
@@ -397,13 +461,14 @@ def updateip(force):
 				remote = current.read().decode('utf-8')
 				remoteData = json.loads(remote)
 				remoteIP4 = remoteData['domain_record']['data']
-			if remoteIP4 != current_ip or force == True:
+				domainname = str(remoteData['domain_record']['name'])
+				if remoteIP4 != current_ip or force == True and domain_status == 1:
 					updated = True
 					data = {'type': 'A', 'data': current_ip}
 					headers = {'Authorization': 'Bearer ' + apikey, "Content-Type": "application/json"}
 					response = requests.patch('https://api.digitalocean.com/v2/domains/'+domain_name+'/records/' + subdomain_id, data=json.dumps(data), headers=headers)
 					if str(response) != '<Response [200]>':
-					logging.error(time.strftime("%Y-%m-%d %H:%M")+' - Error : ' + str(response.json))
+						logging.error(time.strftime("%Y-%m-%d %H:%M")+' - Error updating ('+str(domain_name)+') : ' + str(response.content))
 					else:
 						cursor.execute('UPDATE subdomains SET current_ip4=? WHERE id = ?',(current_ip,subdomain_id,))
 						cursor.execute('UPDATE subdomains SET last_updated=? WHERE id = ?',(now,subdomain_id,))
@@ -422,13 +487,19 @@ def updateip(force):
 
 def local_add_subdomain(domain,domainid):
 	now = datetime.now().strftime("%Y-%m-%d %H:%M")
-	if set(domain).difference(ascii_letters + '.' + digits + '-'):
+	if set(domain).difference(ascii_letters + '.' + digits + '-' + '@'):
 		print('[red]Error:[/red] Give the domain name in simple form e.g. [b]test.domain.com[/b]')
 	else:
 		parts = domain.split('.')
+		if len(parts) > 3:
+			top = parts[1] + '.' + parts[2] + '.' + parts[3]
+			sub = parts[0]
+			
+		else:
 			sub = parts[0]
 			top = parts[1] + '.' + parts[2]
 		apikey = get_api()
+		longtop=sub+'.'+top
 		if apikey == None:
 			print("[red]Error:[/red] Missing APIkey. Please add one!")
 		else:
@@ -437,12 +508,12 @@ def local_add_subdomain(domain,domainid):
 				print('[red]Error:[/red] Failed to get public IP. Do you have a typo in your URI? [red]Error %s.[/red]' % (ip))
 			else:
 				cursor = conn.cursor()
-				cursor.execute('SELECT COUNT(*) FROM domains WHERE name like ?',(top,))
+				cursor.execute('SELECT COUNT(*) FROM domains WHERE name like ? or name like ?',(top,longtop,))
 				count = cursor.fetchone()[0]
 				if count == 0:
 					print('[red]Error:[/red] Top domain [bold]%s[/bold] does not exist in the DB. Please add it with [i]ddns -t %s[/i].' % (top,top))
 				else:
-					cursor.execute('SELECT id FROM domains WHERE name LIKE ?',(top,))
+					cursor.execute('SELECT id FROM domains WHERE name LIKE ? or name like ?',(top,longtop,))
 					topdomain_id = cursor.fetchone()
 					topdomain_id = topdomain_id[0]
 					cursor.execute('SELECT count(*) FROM subdomains WHERE main_id LIKE ? AND name like ?',(topdomain_id,sub,))
@@ -450,11 +521,17 @@ def local_add_subdomain(domain,domainid):
 					if count != 0:
 						print('[red]Error:[/red] [bold]%s[/bold] already exists.' % (domain))
 					else:
-						cursor.execute('INSERT INTO subdomains values(?,?,?,?,?,?,?,?)',(domainid,topdomain_id,sub,ip,None,now,now,now,))
+						cursor.execute('INSERT INTO subdomains values(?,?,?,?,?,?,?,?,?)',(domainid,topdomain_id,sub,ip,None,now,now,now,1,))
 						conn.commit()
 						print('The domain %s has been added.' % (domain))
 
 
+def show_log():
+	log_file = open(logfile, 'r')
+	content = log_file.read()
+	print(content) 
+	log_file.close()
+
 
 def updatedb():
 	# Update DB with new column 20.03.23
@@ -483,6 +560,14 @@ def updatedb():
 		conn.commit()
 		logging.info(time.strftime("%Y-%m-%d %H:%M") + ' - Info : Database updated')
 	
+	new_column = 'active'
+	info = conn.execute("PRAGMA table_info('subdomains')").fetchall()
+	if not any(new_column in word for word in info):
+		add_column = "ALTER TABLE subdomains ADD COLUMN active integer default 1"
+		conn.execute(add_column)
+		conn.commit()
+		logging.info(time.strftime("%Y-%m-%d %H:%M") + ' - Info : Database updated')
+
 
 
 # Commandline arguments
@@ -497,41 +582,47 @@ parser = argparse.ArgumentParser(prog='ddns',
 								formatter_class=RawTextHelpFormatter,
 								epilog='Making Selfhosting easier...')
 
-parser.add_argument('-a', '--api', help='Add/Change API key.', 
+parser.add_argument('-a', '--api', help='Add/Change API key.\n\n', 
 	nargs=1, metavar=('APIkey'), required=False, action="append")
 
-parser.add_argument('-f', '--force', help='Force update of IP address for all domains.', 
+parser.add_argument('-f', '--force', help='Force update of IP address for all domains.\n\n', 
 	required=False, action="store_true")
 
-parser.add_argument('-l', '--list', help='List subdomains for supplied domain.', 
+parser.add_argument('-l', '--list', help='List subdomains for supplied domain.\n\n', 
 	nargs=1, metavar=('domain'), required=False, action="append")
 
-parser.add_argument('-o', '--serverdomains', help='List subdomains for supplied domain not in ddns DB.', 
+parser.add_argument('-o', '--serverdomains', help='List subdomains for supplied domain not in ddns DB.\n\n', 
 	nargs=1, metavar=('domain'), required=False, action="append")
 
-parser.add_argument('-d', '--domains', help='List top domains in your DigitalOcean account.', 
+parser.add_argument('-d', '--domains', help='List top domains in your DigitalOcean account.\n\n', 
 	required=False, action="store_true")
 
-parser.add_argument('-c', '--current', help='List the current IP address for the sub-domain given',
+parser.add_argument('-c', '--current', help='List the current IP address for the sub-domain given\n\n',
 					required=False, nargs=1, action="append")
 
-parser.add_argument('-t', '--top', help='Add a new domain from your DigitalOcean account to use as a dynamic DNS domain',
+parser.add_argument('-t', '--top', help='Add a new domain from your DigitalOcean account to use as a dynamic DNS domain\n\n',
 					required=False, nargs=1, metavar=('domain'), action='append')
 
-parser.add_argument('-s', '--sub', help='Add a new subdomain to your DigitalOcean account and use as dynamic DNS.\n',
+parser.add_argument('-s', '--sub', help='Add a new subdomain to your DigitalOcean account and use as dynamic DNS.\n\n\n',
 					required=False, nargs=1, metavar=('domain'), action='append')
 
-parser.add_argument('-k', '--local', help='Add an existing DigitalOcean subdomain to your ddns DB and use as dynamic DNS.',
+parser.add_argument('-k', '--local', help='Add an existing DigitalOcean subdomain to your ddns DB and use as dynamic DNS.\n\n',
 					required=False, nargs=2, metavar=('domain','domainid'), action='append')
 
-parser.add_argument('-r', '--remove', help='Remove a subdomain from your DigitalOcean account and ddns.',
+parser.add_argument('-r', '--remove', help='Remove a subdomain from your DigitalOcean account and ddns.\n\n',
 					required=False, nargs=1, metavar=('domain'), action='append')
 
-parser.add_argument('-v', '--version', help='Show current version and config info',
+parser.add_argument('-v', '--version', help='Show current version and config info\n\n',
 					required=False, action='store_true')
 
-parser.add_argument('-p', '--ipserver', help='Sets or updates IP server lookup to use. Indicate 4 or 6 for IP type.',
+parser.add_argument('-q', '--log', help=argparse.SUPPRESS, required=False, action='store_true')
+
+
+parser.add_argument('-p', '--ipserver', help='Sets or updates IP server lookup to use. Indicate 4 or 6 for IP type.\n\n',
 					required=False, nargs=2, metavar=('ip4.iurl.no', '4'), action="append")
+
+parser.add_argument('-e', '--edit', help='Changes domain from active to inactive or the other way around...',
+					required=False, nargs=1, metavar=('test.example.com'), action="append")
 args = vars(parser.parse_args())
 
 if args['list']:
@@ -550,12 +641,16 @@ elif args['version']:
 	show_current_info()
 elif args['force']:
 	updateip(True)
+elif args['log']:
+	show_log()
 elif args['ipserver']:
 	ip_server(args['ipserver'][0][0],args['ipserver'][0][1])
 elif args['api']:
 	api(args['api'][0][0])
 elif args['remove']:
 	remove_subdomain(args['remove'][0][0])
+elif args['edit']:
+	edit_subdomain(args['edit'][0][0])
 elif args['local']:
 	local_add_subdomain(args['local'][0][0],args['local'][0][1])
 else: