some refactoring and one less request for aspx maintanance during --os-shell

stamparm · stamparm · commit 6712f4da55e5 · 2010-11-24T14:20:43.000Z
diff --git a/lib/core/common.py b/lib/core/common.py
@@ -1424,19 +1424,19 @@ def goGoodSamaritan(prevValue, originalCharset):
     else:
         return None, None, None, originalCharset
 
-def getCompiledRegex(regex, *args):
+def getCompiledRegex(regex, flags=0):
     """
     Returns compiled regular expression and stores it in cache for further
     usage
     >>> getCompiledRegex('test') # doctest: +ELLIPSIS
     <_sre.SRE_Pattern object at...
     """
 
-    if (regex, args) in kb.cache.regex:
-        return kb.cache.regex[(regex, args)]
+    if (regex, flags) in kb.cache.regex:
+        return kb.cache.regex[(regex, flags)]
     else:
-        retVal = re.compile(regex, *args)
-        kb.cache.regex[(regex, args)] = retVal
+        retVal = re.compile(regex, flags)
+        kb.cache.regex[(regex, flags)] = retVal
         return retVal
 
 def getPartRun():
@@ -1628,11 +1628,11 @@ def getPublicTypeMembers(type_):
 
     return retVal
 
-def extractRegexResult(regex, content):
+def extractRegexResult(regex, content, flags=0):
     retVal = None
 
     if regex and content and '?P<result>' in regex:
-        match = re.search(regex, content)
+        match = re.search(regex, content, flags)
         if match:
             retVal = match.group("result")
 
diff --git a/lib/takeover/web.py b/lib/takeover/web.py
@@ -85,9 +85,8 @@ def __webFileStreamUpload(self, stream, destFileName, directory):
                               }
 
             if self.webApi == "aspx":
-                page = Request.getPage(url=self.webStagerUrl, content=True, raise404=False)
-                multipartParams['__EVENTVALIDATION'] = extractRegexResult(r"__EVENTVALIDATION[^>]+value=\"(?P<result>[^\"]+)\"", page[0])
-                multipartParams['__VIEWSTATE'] = extractRegexResult(r"__VIEWSTATE[^>]+value=\"(?P<result>[^\"]+)\"", page[0])
+                multipartParams['__EVENTVALIDATION'] = kb.data.__EVENTVALIDATION
+                multipartParams['__VIEWSTATE'] = kb.data.__VIEWSTATE
 
             page = Request.getPage(url=self.webStagerUrl, multipart=multipartParams, raise404=False)
 
@@ -212,6 +211,10 @@ def webInit(self):
                 logger.warn(warnMsg)
                 continue
 
+            elif self.webApi == "aspx":
+                kb.data.__EVENTVALIDATION = extractRegexResult(r"__EVENTVALIDATION[^>]+value=\"(?P<result>[^\"]+)\"", uplPage, re.I)
+                kb.data.__VIEWSTATE = extractRegexResult(r"__VIEWSTATE[^>]+value=\"(?P<result>[^\"]+)\"", uplPage, re.I)
+
             infoMsg  = "the file stager has been successfully uploaded "
             infoMsg += "on '%s' ('%s')" % (directory, self.webStagerUrl)
             logger.info(infoMsg)
