updated

README.md

@@ -1,6 +1,6 @@
 # [Darknet Onion Webring (WIP)](http://uptime.nowherejezfoltodf4jiyl6r56jnzintap5vyjlia7fkirfsnfizflqd.onion/)
 
-![logo](./www/img/onion.png)
+![logo](./project.png)
 
 Darknet Onion Webring is powered by a Minimalistic Onion Hidden Service uptime checker, written in only PHP and Python, because javascript is NOT needed.
 

scripts/darknet_exploration.py

@@ -84,9 +84,9 @@ Managing Websites:
  3) Untrust a Website entry (move an entry from unverified to verified.csv) 
 
 Managing Webring Participants:
- 4) Add a new webring participant (and download their files into their directory (without trusting them yet!))
+ 4) Synchronize new links from webring participants, into your unverified.csv file
- 5) Trust a webring participant (Potentially dangerous)
+ 5) Add a new webring participant (and download their files into their directory (without trusting them yet!))
- 6) Untrust a webring participant
+ 6) Trust/UnTrust a webring participant (Potentially dangerous)
  7) Remove a webring participant
 
 Managing Wordlists:
@@ -120,14 +120,11 @@ Maintenance:
 				while(IsCategoryValid(category) is not True):
 				    category = input("What is the website Category ? ")
 			    # the url of the website (required) + check if its valid
-			    #entry_url = input("What is URL of the Website ? (ex: https://torproject.org or http://2gzyxa5ihm7nsggfxnu52rck2vv4rvmdlkiu3zzui5du4xyclen53wid.onion)")
 				url=''
 				while(IsUrlValid(url) is not True):
 					url=input("What is the website URL ? ")
 
 			    # a quick description (optional) + check if its valid
-			    #entry_desc = input("(Optional) Description of the website ? (max 256 characters) (press enter to skip)")
-				#desc="This is a new website that we add, it has this description"
 				desc='DEFAULT'
 				while(IsDescriptionValid(desc) is not True):
 					desc=input("Description for the website ? (Optional)")
@@ -222,12 +219,25 @@ Maintenance:
 
 
 ####### MANAGING WEBRING PARTICIPANTS ###########
-# 4) Add a new webring participant (and download their files into their directory (without trusting them yet!))
+# 4) Synchronize new links from webring participants, into your unverified.csv file
-# 5) Trust a webring participant (Potentially dangerous)
+# 5) Add a new webring participant (and download their files into their directory (without trusting them yet!))
-# 6) Untrust a webring participant
+# 6) Trust/UnTrust a webring participant (Potentially dangerous)
-# 7) Remove a webring participant
+# 7) Blacklist a webring participant (in case of abuses)
 #####################################################
 			case "4": 
+				print("4) Synchronize new links from webring participants, into your unverified.csv file")
+				# TODO iterate through each existing directories in www/participants/*
+					# TODO make sure that they are listed in your webring-participants.csv file
+					# TODO iterate through their verified and unverified.csv files
+						# TODO for each link in the csv file,
+							# TODO check if the link is already listed in your own verified.csv or unverified.csv
+								# TODO Sanity check 1 if not there in either, check if it matches with the blacklisted words
+									# if it does, skip it
+									# if it does not, add it to your own unverified.csv
+									# Sanity check 2 check if it matches with the sensitive wordlist words
+										# if it does, change your own unverified.csv at that entry to mark it as sensitive
+					
+			case "5":
 				print("[+] Add a new webring participant (and download their files into their directory (without trusting them yet!))")
 				webring_participant_url = '' 
 				while(IsOnionValid(webring_participant_url) is not True):			
@@ -366,8 +376,9 @@ Maintenance:
 
 
 			
-			case "5":
+			case "6":
-				print("[+] Trust a webring participant (Potentially dangerous)")
+				print("[+] Trust/UnTrust a webring participant (Potentially dangerous)")
+				# TODO ask if you want to trust or untrust a webring participant
 				#  TODO print a warning to tell the user that you're about to trust all of the links that are trusted by another peer, if that peer is malicious they may start trusting links that you don't trust! proceed? (answer is y otherwise skip)
 				choice=''
 				choice=input("You're about to trust another peer, this means that you're going to automatically trust all of the links they have in their verified.csv file! If this is a malicious peer, you're about to potentially trust malicious links, it is potentially risky! Do you want to continue ? (y/n)")
@@ -376,23 +387,29 @@ Maintenance:
 					print("Please choose a webring participant to trust:")	
 					# TODO make the user choose a valid index	
 					# TODO and write V into the "Trusted" column
+					# TODO for each row in the webring participant's verified.csv file, (use the url to check)
+						# TODO check if it already exists or not in your verified.csv file (if length of url to check is 0 then save and add new row, else ignore it)
+						# TODO write to csv
 				else:
 					print("Exiting.")	
 				searchterm = input("What is the index of the entry that you want to trust ?")
-			case "6":
+
 				# TODO
 				print("[+] Untrust a webring participant (safer)")
 				print("Please choose a webring participant to untrust:")	
+				# TODO list the webring participants in the webring-participants.csv file
 				# TODO make the user choose a valid index	
 				# TODO and write "" into the "Trusted" column
+
 			case "7":
 				# TODO
-				print("[+] Remove a webring participant (in case of abuses)")
+				print("[+] Blacklist a webring participant (in case of abuses)")
+				# TODO list the existing webring participants in www/participants/
 				print("Please choose a webring participant to blacklist:")	
-				# TODO add it to blacklist.csv 
+				# TODO add it's URL to your own blacklist.csv 
 				# TODO remove all of the entries that came from that participant (drop the lines in verified+unverified.csv that have that instance in the instance column) 
 				# TODO remove it from your own webring-participants.csv
-				# TODO remove remove the directory in www/participants/INSTANCENAME
+				# TODO remove the entire directory in www/participants/INSTANCENAME
 
 
 

scripts/tests/checkimagesize.py

@@ -0,0 +1,18 @@
+from PIL import Image
+def main():
+	print('[+] checking image size')
+	im = Image.open("banner.png")
+	#im = Image.open("favicon.png")
+	width, height = im.size
+	print('width =',width, 'height=',height)
+	if width != 240 or height != 60:
+		print('[-] Banner doesnt have the correct size (240x60)')
+		return False
+	else: 
+		print('[+] Banner has the correct size (240x60)')
+		return True
+
+
+if __name__ == '__main__':
+	main()
+