Use session properties instead of setters

Signed-off-by: Jorge Bescos Gascon <[email protected]>

Author: jbescos

mail/src/main/java/com/sun/mail/util/MimeBodyPartPropOverrider.java

@@ -16,16 +16,42 @@
 
 package jakarta.mail.internet;
 
-import jakarta.mail.*;
-import jakarta.activation.*;
-import java.io.*;
-import java.util.*;
-import com.sun.mail.util.PropUtil;
+import jakarta.activation.DataHandler;
+import jakarta.activation.DataSource;
+import jakarta.activation.FileDataSource;
+import jakarta.mail.BodyPart;
+import jakarta.mail.EncodingAware;
+import jakarta.mail.FolderClosedException;
+import jakarta.mail.Header;
+import jakarta.mail.IllegalWriteException;
+import jakarta.mail.Message;
+import jakarta.mail.MessageContext;
+import jakarta.mail.MessageRemovedException;
+import jakarta.mail.MessagingException;
+import jakarta.mail.Multipart;
+import jakarta.mail.Part;
+import jakarta.mail.Session;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.Properties;
+
 import com.sun.mail.util.ASCIIUtility;
-import com.sun.mail.util.MimeUtil;
-import com.sun.mail.util.MessageRemovedIOException;
 import com.sun.mail.util.FolderClosedIOException;
 import com.sun.mail.util.LineOutputStream;
+import com.sun.mail.util.MessageRemovedIOException;
+import com.sun.mail.util.MimeUtil;
+import com.sun.mail.util.PropUtil;
 
 /**
  * This class represents a MIME body part. It implements the 
@@ -193,6 +219,34 @@ public MimeBodyPart(InternetHeaders headers, byte[] content)
 	this.content = content;
     }
 
+    /**
+     * Initializes MimeBodyPart from the InputStream is and it overwrites
+     * properties from session.
+     *
+     * @param session   Session object for this message
+     * @param is    the message input stream
+     * @exception   MessagingException for failures
+     */
+    public MimeBodyPart(Session session, InputStream is) throws MessagingException {
+        this(is);
+        initializeProperties(session);
+    }
+
+    /**
+     * Set the values from session properties if exist, otherwise it keeps the previous value.
+     * @param session the not null session
+     */
+    private void initializeProperties(Session session) {
+        Properties props = session.getProperties();
+        setDefaultTextCharset =  PropUtil.getBooleanProperty(props, "mail.mime.setdefaulttextcharset", setDefaultTextCharset);
+        setContentTypeFileName =  PropUtil.getBooleanProperty(props, "mail.mime.setcontenttypefilename", setContentTypeFileName);
+        encodeFileName =  PropUtil.getBooleanProperty(props, "mail.mime.encodefilename", encodeFileName);
+        decodeFileName =  PropUtil.getBooleanProperty(props, "mail.mime.decodefilename", decodeFileName);
+        ignoreMultipartEncoding =  PropUtil.getBooleanProperty(props, "mail.mime.ignoremultipartencoding", ignoreMultipartEncoding);
+        allowutf8 =  PropUtil.getBooleanProperty(props, "mail.mime.allowutf8", allowutf8);
+        cacheMultipart =  PropUtil.getBooleanProperty(props, "mail.mime.cachemultipart", cacheMultipart);
+    }
+
     /**
      * Return the size of the content of this body part in bytes.
      * Return -1 if the size cannot be determined. <p>

mail/src/main/java/com/sun/mail/util/MimeMessagePropOverrider.java

@@ -338,16 +338,21 @@ protected MimeMessage(Folder folder, InternetHeaders headers,
     }
 
     /**
-     * Set the strict flag based on property.
+     * Set the properties from session if exists, otherwise it keeps the previous value.
      */
     private void initStrict() {
-	if (session != null) {
-	    Properties props = session.getProperties();
-	    strict = PropUtil.getBooleanProperty(props,
-				    "mail.mime.address.strict", true);
-	    allowutf8Headers = PropUtil.getBooleanProperty(props,
-				    "mail.mime.allowutf8", false);
-	}
+    	if (session != null) {
+    	    Properties props = session.getProperties();
+    	    strict = PropUtil.getBooleanProperty(props, "mail.mime.address.strict", true);
+    	    allowutf8Headers = PropUtil.getBooleanProperty(props, "mail.mime.allowutf8", false);
+    	    setDefaultTextCharset = PropUtil.getBooleanProperty(props, "mail.mime.setdefaulttextcharset", setDefaultTextCharset);
+    	    setContentTypeFileName = PropUtil.getBooleanProperty(props, "mail.mime.setcontenttypefilename", setContentTypeFileName);
+    	    encodeFileName = PropUtil.getBooleanProperty(props, "mail.mime.encodefilename", encodeFileName);
+    	    decodeFileName = PropUtil.getBooleanProperty(props, "mail.mime.decodefilename", decodeFileName);
+    	    ignoreMultipartEncoding = PropUtil.getBooleanProperty(props, "mail.mime.ignoremultipartencoding", ignoreMultipartEncoding);
+    	    allowutf8 = PropUtil.getBooleanProperty(props, "mail.mime.allowutf8", allowutf8);
+    	    cacheMultipart = PropUtil.getBooleanProperty(props, "mail.mime.cachemultipart", cacheMultipart);
+    	}
     }
 
     /**

mail/src/main/java/com/sun/mail/util/MimePartDataSourcePropOverrider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -991,7 +991,13 @@ protected MimeBodyPart createMimeBodyPart(InternetHeaders headers,
      */
     protected MimeBodyPart createMimeBodyPart(InputStream is)
 				throws MessagingException {
-	return new MimeBodyPart(is);
+        if (ds != null && ds instanceof MimePartDataSource) {
+            Session session = ((MimePartDataSource)ds).getMessageContext().getSession();
+            if (session != null) {
+                return new MimeBodyPart(session, is);
+            }
+        }
+        return new MimeBodyPart(is);
     }
 
     private MimeBodyPart createMimeBodyPartIs(InputStream is)