Minimal useragent validation #1840

Merged
g1itch merged 1 commits from obsolete into v0.6 2021-09-05 19:26:09 +02:00
Showing only changes of commit a7d6037fc5 - Show all commits

View File

@ -5,6 +5,7 @@ Class BMProto defines bitmessage's network protocol workflow.
import base64 import base64
import hashlib import hashlib
import logging import logging
import re
import socket import socket
import struct import struct
import time import time
@ -535,6 +536,10 @@ class BMProto(AdvancedDispatcher, ObjectTracker):
return True return True
self.append_write_buf(protocol.CreatePacket('verack')) self.append_write_buf(protocol.CreatePacket('verack'))
self.verackSent = True self.verackSent = True
ua_valid = re.match(
r'^/[a-zA-Z]+:[0-9]+\.?[\w\s\(\)\./:;-]*/$', self.userAgent)
if not ua_valid:
self.userAgent = '/INVALID:0/'
if not self.isOutbound: if not self.isOutbound:
self.append_write_buf(protocol.assembleVersionMessage( self.append_write_buf(protocol.assembleVersionMessage(
self.destination.host, self.destination.port, self.destination.host, self.destination.port,