Expand flags into ICAP

Author: yadij

src/adaptation/icap/ModXact.cc

@@ -961,7 +961,7 @@ void Adaptation::Icap::ModXact::prepEchoing()
 
     // write the virgin message into a memory buffer
     httpBuf.init();
-    packHead(httpBuf, oldHead);
+    packHead(httpBuf, oldHead, MaskSensitiveInfo::off);
 
     // allocate the adapted message and copy metainfo
     Must(!adapted.header);
@@ -1615,15 +1615,15 @@ Adaptation::Icap::ModXact::encapsulateHead(MemBuf &icapBuf, const char *section,
     }
 
     // pack polished HTTP header
-    packHead(httpBuf, headClone.getRaw());
+    packHead(httpBuf, headClone.getRaw(), MaskSensitiveInfo::off);
 
     // headClone unlocks and, hence, deletes the message we packed
 }
 
 void
-Adaptation::Icap::ModXact::packHead(MemBuf &httpBuf, const Http::Message *head)
+Adaptation::Icap::ModXact::packHead(MemBuf &httpBuf, const Http::Message *head, const MaskSensitiveInfo masking)
 {
-    head->packInto(&httpBuf, true);
+    head->packInto(&httpBuf, true, masking);
 }
 
 // decides whether to offer a preview and calculates its size

src/adaptation/icap/ModXact.h

@@ -281,7 +281,7 @@ class ModXact: public Xaction, public BodyProducer, public BodyConsumer
     template<class Part>
     bool parsePart(Part *part, const char *description);
 
-    void packHead(MemBuf &httpBuf, const Http::Message *head);
+    void packHead(MemBuf &httpBuf, const Http::Message *head, const MaskSensitiveInfo);
     void encapsulateHead(MemBuf &icapBuf, const char *section, MemBuf &httpBuf, const Http::Message *head);
     bool gotEncapsulated(const char *section) const;
     /// whether ICAP response header indicates HTTP header presence

src/http/Message.cc

@@ -250,10 +250,10 @@ Http::Message::persistent() const
 }
 
 void
-Http::Message::packInto(Packable *p, bool full_uri) const
+Http::Message::packInto(Packable *p, bool full_uri, const MaskSensitiveInfo mask) const
 {
     packFirstLineInto(p, full_uri);
-    header.packInto(p, MaskSensitiveInfo::off);
+    header.packInto(p, mask);
     p->append("\r\n", 2);
 }
 

src/http/Message.h

@@ -50,7 +50,7 @@ class Message : public RefCountable
 
     virtual void reset() = 0; // will have body when http*Clean()s are gone
 
-    void packInto(Packable *, bool full_uri) const;
+    void packInto(Packable *, bool full_uri, const MaskSensitiveInfo) const;
 
     ///< produce a message copy, except for a few connection-specific settings
     virtual Http::Message *clone() const = 0; // TODO rename: not a true copy?

src/tests/stub_libhttp.cc

@@ -38,7 +38,7 @@ namespace Http
 {
 Message::Message(const http_hdr_owner_type owner): header(owner) {STUB}
 Message::~Message() {STUB}
-void Message::packInto(Packable *, bool) const STUB
+void Message::packInto(Packable *, bool, const MaskSensitiveInfo) const STUB
 void Message::setContentLength(int64_t) STUB
 bool Message::persistent() const STUB_RETVAL(false)
 void Message::putCc(const HttpHdrCc &) STUB