diff --git a/plugins/filepwn.py b/plugins/filepwn.py index 83d947c..f8c03ea 100644 --- a/plugins/filepwn.py +++ b/plugins/filepwn.py @@ -374,12 +374,11 @@ class FilePwn(Plugin): ADD_SECTION=add_section, CAVE_JUMPING=cave_jumping, IMAGE_TYPE=self.WindowsType, - RUNAS_ADMIN=self.str2bool(self.WindowsIntelx86['RUNAS_ADMIN']), + CHECK_ADMIN=self.str2bool(self.WindowsIntelx86['RUNAS_ADMIN']), PATCH_DLL=self.str2bool(self.WindowsIntelx64['PATCH_DLL']), SUPPLIED_SHELLCODE=self.WindowsIntelx64['SUPPLIED_SHELLCODE'], ZERO_CERT=self.str2bool(self.WindowsIntelx64['ZERO_CERT']), - PATCH_METHOD=self.WindowsIntelx64['PATCH_METHOD'].lower(), - SUPPLIED_BINARY=self.WindowsIntelx64['SUPPLIED_BINARY'], + PATCH_METHOD=self.WindowsIntelx64['PATCH_METHOD'].lower() ) result = targetFile.run_this() @@ -408,13 +407,11 @@ class FilePwn(Plugin): ADD_SECTION=add_section, CAVE_JUMPING=cave_jumping, IMAGE_TYPE=self.WindowsType, - RUNAS_ADMIN=self.str2bool(self.WindowsIntelx86['RUNAS_ADMIN']), + CHECK_ADMIN=self.str2bool(self.WindowsIntelx86['RUNAS_ADMIN']), PATCH_DLL=self.str2bool(self.WindowsIntelx86['PATCH_DLL']), SUPPLIED_SHELLCODE=self.WindowsIntelx86['SUPPLIED_SHELLCODE'], ZERO_CERT=self.str2bool(self.WindowsIntelx86['ZERO_CERT']), - PATCH_METHOD=self.WindowsIntelx86['PATCH_METHOD'].lower(), - SUPPLIED_BINARY=self.WindowsIntelx86['SUPPLIED_BINARY'], - XP_MODE=self.str2bool(self.WindowsIntelx86['XP_MODE']) + PATCH_METHOD=self.WindowsIntelx86['PATCH_METHOD'].lower() ) result = targetFile.run_this() @@ -610,7 +607,7 @@ class FilePwn(Plugin): self.log.debug("Updating Config {0}: {1}".format(key, value)) def response(self, response, request, data): - + try: content_header = response.headers['content-type'] client_ip = request.client.getClientIP() host = request.headers['host'] @@ -674,4 +671,6 @@ class FilePwn(Plugin): self.clientlog.error(exc, extra=request.clientInfo) self.clientlog.warning("Returning original file", extra=request.clientInfo) - return {'response': response, 'request': request, 'data': data} \ No newline at end of file + return {'response': response, 'request': request, 'data': data} + except: + self.clientlog.info('Filepwn failed to response this request', extra=request.clientInfo)