@ -157,6 +157,35 @@ kaz::operator >> (istream &in, AttachMode &attachMode) {
return in ; return in ;
} }
// ================================================================================
const string
kaz : : headerTypeLabels [ ] = {
" Same " , " Multi " , " MainPlain " , " AttachHtml "
} ;
const map < string , HeaderType >
kaz : : headerTypeMap = boost : : assign : : map_list_of
( " same " , SAME )
( " multi " , MULTI )
( " mainplain " , MAIN_PLAIN )
( " attachhtml " , ATTACH_HTML )
;
ostream &
kaz : : operator < < ( ostream & out , const HeaderType & headerType ) {
//BOOST_ASSERT (treeType >= MIN && treeType <= ALPHA);
return out < < headerTypeLabels [ headerType ] ;
}
istream &
kaz : : operator > > ( istream & in , HeaderType & headerType ) {
string token ;
in > > token ;
auto pos = headerTypeMap . find ( boost : : algorithm : : to_lower_copy ( token ) ) ;
if ( pos = = headerTypeMap . end ( ) )
in . setstate ( ios_base : : failbit ) ;
else
headerType = pos - > second ;
return in ;
}
// ================================================================================
// ================================================================================
void void
MainAttachment : : copy ( ifstream & mbox , ofstream & outbox , const streamoff & begin , const streamoff & end ) { MainAttachment : : copy ( ifstream & mbox , ofstream & outbox , const streamoff & begin , const streamoff & end ) {
@ -420,6 +449,7 @@ MainAttachment::extractPreviousKAZ (ifstream &mbox) {
void void
MainAttachment : : removePreviousArchive ( ) { MainAttachment : : removePreviousArchive ( ) {
DEF_LOG ( " MainAttachment::removePreviousArchive " , " " ) ;
vector < string > toRemove ; vector < string > toRemove ;
for ( map < string , string > : : const_iterator it = previousLinks . begin ( ) ; it ! = previousLinks . end ( ) ; + + it ) { for ( map < string , string > : : const_iterator it = previousLinks . begin ( ) ; it ! = previousLinks . end ( ) ; + + it ) {
const string key ( it - > first ) ; const string key ( it - > first ) ;
@ -430,6 +460,41 @@ MainAttachment::removePreviousArchive () {
previousLinks . erase ( old ) ; previousLinks . erase ( old ) ;
} }
// ================================================================================
void MainAttachment : : rewriteHeaders ( ifstream & mbox , ofstream & outbox , const HeaderType & headerType ) {
DEF_LOG ( " MainAttachment::rewriteHeaders " , " headerType: " < < headerType ) ;
if ( SAME = = headerType ) {
copy ( mbox , outbox , 0 , contentPos ) ;
return ;
}
string mime ( getMime ( mbox ) ) ;
string : : size_type startPos = ( 0 ) ;
for ( string token : { string ( " content-transfer-encoding " ) , Attachment : : contentTypeToken } ) {
startPos = caseInsensitiveFind ( mime , token ) ;
for ( string : : size_type stopPos ( startPos ) ;
( stopPos = mime . find ( " \n " , stopPos ) ) ! = string : : npos ;
) {
if ( string ( " \t " ) . find ( mime [ stopPos + 1 ] ) = = string : : npos ) {
mime . erase ( startPos , stopPos - startPos ) ;
break ;
}
}
}
string contentType ( KAZ_EMPTY_TEXT_PLAIN ) ;
switch ( headerType ) {
case SAME : /* no way */ ;
case MAIN_PLAIN : contentType = KAZ_EMPTY_TEXT_PLAIN ; break ;
case ATTACH_HTML : contentType = KAZ_ATTACHMENT_TEXT_HTML ; break ;
case MULTI :
boundary = " __KAZ__ " + boundaryGen ( 40 ) ;
contentType = " Content-Type: multipart/mixed; boundary= \" " + boundary + " \" " ;
boundary = " -- " + boundary + " -- " ;
boundaryMiddleSize = boundary . length ( ) - 2 ;
}
mime . insert ( startPos , contentType ) ;
outbox < < mime < < flush ;
}
// ================================================================================
// ================================================================================
MainAttachment : : MainAttachment ( ifstream & mbox ) MainAttachment : : MainAttachment ( ifstream & mbox )
: Attachment ( mbox , initTmpLevel ( ) , 0 , initTmpPos ( ) ) , : Attachment ( mbox , initTmpLevel ( ) , 0 , initTmpPos ( ) ) ,
@ -566,6 +631,15 @@ MainAttachment::extract (ifstream &mbox, const SizeArg &minSize) const {
} }
// ================================================================================
// ================================================================================
/*!
Régle à appliquer dans le cas où Kaz ajoute son cartouche et que le corps principale n ' est pas multipart :
< table >
< tr > < th > src < / th > < th > FOOTER < / th > < th > BOTH < / th > < th > ATTCH < / th > < / tr >
< tr > < th > text / plain < / th > < td > OK < / td > < td > mute multi < / td > < td > mute multi < / td > < / tr >
< tr > < th > empty mail < / th > < td > mute plain < / td > < td > mute multi < / td > < td > mute html < / td > < / tr >
< / table >
*/
void void
MainAttachment : : substitute ( ifstream & mbox , ofstream & outbox , const SizeArg & minSize , AttachMode attachMode ) { MainAttachment : : substitute ( ifstream & mbox , ofstream & outbox , const SizeArg & minSize , AttachMode attachMode ) {
DEF_LOG ( " MainAttachment::substitute " , " minSize: " < < minSize < < " AttachMode: " < < attachMode ) ; DEF_LOG ( " MainAttachment::substitute " , " minSize: " < < minSize < < " AttachMode: " < < attachMode ) ;
@ -600,53 +674,55 @@ MainAttachment::substitute (ifstream &mbox, ofstream &outbox, const SizeArg &min
string plainDisclaim , htmlDisclaim ; string plainDisclaim , htmlDisclaim ;
getDisclaim ( plainDisclaim , htmlDisclaim ) ; getDisclaim ( plainDisclaim , htmlDisclaim ) ;
HeaderType headerType ( SAME ) ;
// copy email
// copy email
if ( ! boundary . size ( ) & & plainDisclaim . size ( ) ) { if ( ! boundary . size ( ) & & plainDisclaim . size ( ) )
if ( attachMode & ATTACHMENT ) switch ( attachMode ) {
attachMode = FOOTER ; case NONE : LOG_BUG ( true , /* */ , " eMailShrinker: bug M12: nothing to do " ) ; break ;
if ( emptyEMail ) { case FOOTER : headerType = ( emptyEMail ? MAIN_PLAIN : SAME ) ; break ;
// only one attachment must be replace
case BOTH : headerType = MULTI ; break ;
cerr < < " eMailShrinker: force one attachment " < < endl ; case ATTACHMENT : headerType = ATTACH_HTML ; break ;
string mime ( getMime ( mbox ) ) ; }
string : : size_type startPos = ( 0 ) ; rewriteHeaders ( mbox , outbox , headerType ) ;
for ( string token : { string ( " Content-Transfer-Encoding " ) , Attachment : : contentTypeToken } ) { streamoff curPos = contentPos ;
startPos = caseInsensitiveFind ( mime , " Content-Transfer-Encoding " ) ;
for ( string : : size_type stopPos ( startPos ) ; if ( MAIN_PLAIN = = headerType ) {
( stopPos = mime . find ( " \n " , stopPos ) ) ! = string : : npos ; LOG ( " Replace old content with plain " ) ;
) {
if ( string ( " \t " ) . find ( mime [ stopPos + 1 ] ) = = string : : npos ) {
mime . erase ( startPos , stopPos - startPos ) ;
break ;
}
}
}
mime . insert ( startPos , KAZ_EMPTY_TEXT_PLAIN ) ;
string content ( plainDisclaim ) ; string content ( plainDisclaim ) ;
base64Encode ( content ) ; base64Encode ( content ) ;
outbox < < mime outbox < < content < < endl ;
< < content < < endl ;
outbox . flush ( ) ; outbox . flush ( ) ;
outbox . close ( ) ;
return ; return ;
}
} }
streamoff curPos = 0 ; if ( ATTACH_HTML = = headerType ) {
copy ( mbox , outbox , curPos , contentPos ) ; LOG ( " Replace old content with html " ) ;
curPos = contentPos ; string content ( plainDisclaim ) ;
base64Encode ( content ) ;
if ( plainDisclaim . size ( ) ) { outbox < < content < < endl ;
if ( emptyEMail & & ( attachMode & FOOTER ) ) { outbox . flush ( ) ;
// check no main text
return ;
LOG ( " Force main text " ) ;
cerr < < " eMailShrinker: force footer " < < endl ;
string content ( plainDisclaim ) ;
base64Encode ( content ) ;
outbox < < boundary . substr ( 0 , boundary . length ( ) - 2 ) < < endl
< < KAZ_EMPTY_TEXT_PLAIN < < endl
< < content < < endl ;
outbox . flush ( ) ;
}
} }
if ( plainDisclaim . size ( ) & & emptyEMail & & ( attachMode & FOOTER ) ) {
// case : multi
LOG ( " Force main text " ) ;
cerr < < " eMailShrinker: force main text " < < endl ;
string content ( plainDisclaim ) ;
base64Encode ( content ) ;
outbox < < boundary . substr ( 0 , boundary . length ( ) - 2 ) < < endl
< < KAZ_EMPTY_TEXT_PLAIN < < endl
< < content < < endl ;
outbox . flush ( ) ;
}
if ( MULTI = = headerType ) {
LOG ( " New boundary " ) ;
map < string , string > : : const_iterator it ( env . find ( contentTypeToken ) ) ;
LOG_BUG ( it = = env . end ( ) , /* */ , " eMailShrinker: bug M13: no content-type " ) ;
outbox < < boundary . substr ( 0 , boundary . length ( ) - 2 ) < < endl
< < Attachment : : contentTypeToken < < " : " < < it - > second < < endl ;
}
for ( Attachment * attachP : allMarkedPtrs ) { for ( Attachment * attachP : allMarkedPtrs ) {
copy ( mbox , outbox , curPos , attachP - > beginInParent ) ; copy ( mbox , outbox , curPos , attachP - > beginInParent ) ;
LOG_BUG ( attachP - > toUpdate & & attachP - > toExtract , /**/ , " eMailShrinker: bug M5: update and extract. pos: " < < attachP - > beginPos ) ; LOG_BUG ( attachP - > toUpdate & & attachP - > toExtract , /**/ , " eMailShrinker: bug M5: update and extract. pos: " < < attachP - > beginPos ) ;
@ -727,12 +803,15 @@ MainAttachment::substitute (ifstream &mbox, ofstream &outbox, const SizeArg &min
outbox . flush ( ) ; outbox . flush ( ) ;
curPos = attachP - > endPos ; curPos = attachP - > endPos ;
} }
if ( plainDisclaim . size ( ) & & ( attachMode & ATTACHMENT ) ) { if ( plainDisclaim . size ( ) & & ( attachMode & ATTACHMENT ) ) {
LOG ( " Add kaz attachment " ) ; LOG ( " Add kaz attachment " ) ;
cerr < < " eMailShrinker: force attachment " < < endl ; cerr < < " eMailShrinker: force attachment " < < endl ;
streamoff lastPos = subAttachements . back ( ) . endPos ; if ( subAttachements . size ( ) ) {
copy ( mbox , outbox , curPos , lastPos ) ; streamoff lastPos = subAttachements . back ( ) . endPos ;
curPos = lastPos ; copy ( mbox , outbox , curPos , lastPos ) ;
curPos = lastPos ;
}
string content ( KAZ_HTML_CONTENT + htmlDisclaim + BODY_END + HTML_END ) ; string content ( KAZ_HTML_CONTENT + htmlDisclaim + BODY_END + HTML_END ) ;
base64Encode ( content ) ; base64Encode ( content ) ;
@ -742,7 +821,8 @@ MainAttachment::substitute (ifstream &mbox, ofstream &outbox, const SizeArg &min
outbox . flush ( ) ; outbox . flush ( ) ;
} }
copy ( mbox , outbox , curPos , endPos ) ; copy ( mbox , outbox , curPos , endPos ) ;
//outbox << endl;
if ( MULTI = = headerType )
outbox < < boundary . substr ( 0 , boundary . length ( ) ) < < endl ;
outbox . close ( ) ; outbox . close ( ) ;
} }
