package org.sagebionetworks.util;

import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.util.regex.Pattern;

import com.google.common.net.UrlEscapers;

public class ContentDispositionUtils {

	//matches characters that are not compliant with  ISO-8859-1 (https://en.wikipedia.org/wiki/ISO/IEC_8859-1). We use this to replace non-ascii characters with _
	private static final Pattern NON_ISO_8859_1_REGEX =
			Pattern.compile("[^\\u0020-\\u007E\\u00A0-\\u00ff]");

	/**
	 * The format string for the 'Content-Disposition' header property.
	 */
	public static final String CONTENT_DISPOSITION_FORMAT_STRING = "attachment; filename=\"%s\"; filename*=utf-8''%s";

	/**
	 * The Content Disposition Value contains the file name.  For example if the file name is: 'foo.bar'
	 * then the content disposition value will be: 'attachment; filename="foo.bar"'
	 * @param fileName
	 * @return
	 */
	public static String getContentDispositionValue(String fileName){
			return String.format(CONTENT_DISPOSITION_FORMAT_STRING, NON_ISO_8859_1_REGEX.matcher(fileName).replaceAll("_"), UrlEscapers.urlFragmentEscaper().escape(fileName));
	}
}

@@ -217,16 +217,121 @@
 tils %7B%0A%0A
+%09//Amazon S3 does not expect characters that are not ISO-8859-1. Unicode characters must be URL encoded.%0A
 %09//match
@@ -459,17 +459,18 @@
 ace 
-non-ascii
+ISO-8859-1
  cha

update comment