1 files changed, 42 insertions, 17 deletions
diff --git a/libmproxy/console/common.py b/libmproxy/console/common.py
index 12fdfe27..f28db013 100644
--- a/libmproxy/console/common.py
+++ b/libmproxy/console/common.py
@@ -276,27 +276,30 @@ def copy_flow_format_data(part, scope, flow):
                     raise ValueError("Unknown part: {}".format(part))
     return data, False
 
+def copy_as_curl_command(flow):
 
-def copy_flow(part, scope, flow, master, state):
-    """
-    part: _c_ontent, _h_eaders+content, _u_rl
-    scope: _a_ll, re_q_uest, re_s_ponse
-    """
-    data, err = copy_flow_format_data(part, scope, flow)
+    if flow.request.content is None or flow.request.content == CONTENT_MISSING:
+        return None, "Request content is missing"
 
-    if err:
-        signals.status_message.send(message=err)
-        return
+    headerString = ""
+    for k,v in flow.request.headers:
+      headerString += " -H \"" + k + ":" + v + "\" "
+
+    data = "curl"
+
+    if flow.request.method != "GET":
+      data += " -X " + flow.request.method
+
+    full_url = flow.request.scheme + "://" + flow.request.host + flow.request.path
+    data += headerString + " \"" + full_url + "\""
+
+    if flow.request.content != None and flow.request.content != "":
+      data += " --data-binary " + "'" + flow.request.content + "'"
+
+    copy_to_clipboard_or_prompt(data)
 
-    if not data:
-        if scope == "q":
-            signals.status_message.send(message="No request content to copy.")
-        elif scope == "s":
-            signals.status_message.send(message="No response content to copy.")
-        else:
-            signals.status_message.send(message="No contents to copy.")
-        return
 
+def copy_to_clipboard_or_prompt(data):
     # pyperclip calls encode('utf-8') on data to be copied without checking.
     # if data are already encoded that way UnicodeDecodeError is thrown.
     toclip = ""
@@ -320,6 +323,28 @@ def copy_flow(part, scope, flow, master, state):
             callback = save
         )
 
+def copy_flow(part, scope, flow, master, state):
+    """
+    part: _c_ontent, _h_eaders+content, _u_rl
+    scope: _a_ll, re_q_uest, re_s_ponse
+    """
+    data, err = copy_flow_format_data(part, scope, flow)
+
+    if err:
+        signals.status_message.send(message=err)
+        return
+
+    if not data:
+        if scope == "q":
+            signals.status_message.send(message="No request content to copy.")
+        elif scope == "s":
+            signals.status_message.send(message="No response content to copy.")
+        else:
+            signals.status_message.send(message="No contents to copy.")
+        return
+
+    copy_to_clipboard_or_prompt(data)
+
 
 def ask_copy_part(scope, flow, master, state):
     choices = [