147. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 7/10/2017 1:01:46 PM Central Daylight Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

147.1 Files compared

#	Location	File	Last Modified
1	C:\AraxisMergeCompare\Pri_un\IV-ehmp_cif\TomcatAdapter\main\src\java\gov\va\med\server\tomcat	TomcatBasicAuthenticatorValve.java	Thu Jun 29 17:22:52 2017 UTC
2	C:\AraxisMergeCompare\Pri_re\IV-ehmp_cif\TomcatAdapter\main\src\java\gov\va\med\server\tomcat	TomcatBasicAuthenticatorValve.java	Thu Jul 6 15:05:16 2017 UTC

147.2 Comparison summary

Description	Between Files 1 and 2
Description	Text Blocks	Lines
Unchanged	3	174
Changed	2	4
Inserted	0	0
Removed	0	0

147.3 Comparison options

Whitespace
Character case	Differences in character case are significant
Line endings	Differences in line endings (`CR` and `LF` characters) are ignored
CR/LF characters	Not shown in the comparison detail

147.4 Active regular expressions

No regular expressions were active.

147.5 Comparison detail

	1	/**
	2	*
	3	Package: MAG - Vis tA Imaging
	4	WARNING: Per VHA D irective 2 004-038, t his routin e should n ot be modi fied.
	5	Date Cre ated: May 19, 2011
	6	Site Nam e: Washin gton OI Fi eld Office , Silver S pring, MD
	7	Developer: WERFEJ
	8	Descript ion:
	9
	10	;; +-------- ---------- ---------- ---------- ---------- ---------- ---------- +
	11	;; Property of the US Government .
	12	;; No permis sion to co py or redi stribute t his softwa re is give n.
	13	;; Use of un released v ersions of this soft ware requi res the us er
	14	;; to execu te a writt en test ag reement wi th the Vis tA Imaging
	15	;; Developm ent Office of the De partment o f Veterans Affairs,
	16	;; telephon e (301) 73 4-0100.
	17	;;
	18	;; The Food and Drug A dministrat ion classi fies this software a s
	19	;; a Class I I medical device. A s such, it may not b e changed
	20	;; in any wa y. Modifi cations to this soft ware may r esult in a n
	21	;; adulterat ed medical device un der 21CFR8 20, the us e of which
	22	;; is consid ered to be a violati on of US F ederal Sta tutes.
	23	;; +-------- ---------- ---------- ---------- ---------- ---------- ---------- +
	24
	25	*/
	26	package go v.va.med.s erver.tomc at;
	27
	28	import gov .va.med.im aging.tomc at.vistare alm.RealmE rrorContex t;
	29
	30	import jav a.io.IOExc eption;
	31
	32	import org .apache.ca talina.con nector.Req uest;
	33	import org .apache.ca talina.con nector.Res ponse;
	34	//import o rg.apache. catalina.d eploy.Logi nConfig;
	35	import org .apache.to mcat.util. descriptor .web.Login Config;
	36	import org .apache.lo g4j.Logger ;
	37
	38
	39	/**
	40	* This ex tends the Basic auth entication valve for Tomcat an d checks f or values on thread local to a dd as resp onse heade rs.
	41	* This al lows a cli ent to kno w why an a uthenticat ion failed
	42	*
	43	* @author WERFEJ
	44	*
	45	*/
	46	public cla ss TomcatB asicAuthen ticatorVal ve
	47	extends or g.apache.c atalina.au thenticato r.BasicAut henticator
	48	{
	49	pr ivate fina l static L ogger logg er = Logge r.getLogge r(TomcatBa sicAuthent icatorValv e.class);
	50	pu blic final static St ring httpH eaderAuthe nticateErr orMessage = "xxx-aut henticate- error-mess age";
	51	pu blic final static St ring httpH eaderAuthe nticateErr orName = " xxx-authen ticate-err or-name";
	52	pu blic final static St ring httpH eaderSkipV istaAuthen tication = "xxx-skip -vista-aut henticatio n";
	53
	54	pu blic Tomca tBasicAuth enticatorV alve()
	55	{
	56	supe r();
	57	logg er.info("T omcatBasic Authentica torValve < ctor>");
	58	}
	59
	60	// @Override
	61	pu blic boole an authent icate(Requ est reques t, Respons e response , LoginCon fig loginC onfig)
	62	throws IOExcepti on
	63	{
	64	// m ust clear before cal ling to en sure not u sing a pre vious atte mpts data (since thr eads are r ecycled)
	65	Real mErrorCont ext.clear( );
	66	logg er.debug(" TomcatBasi cAuthentic atorValve. authentica te(Request , Response , LoginCon fig)");
	67	Stri ng skipVis taAuthenti cationStri ng = requ est.getHea der(httpHe aderSkipVi staAuthent ication);
	68	if(s kipVistaAu thenticati onString ! = null){
	69	RealmE rrorContex t.setSkipV istaAuthen tication(s kipVistaAu thenticati onString);
	70	}
	71	//bo olean resu lt = super .authentic ate(reques t, respons e, loginCo nfig);
	72	bool ean result = super.a uthenticat e(request, response) ;
	73	if(! result)
	74	{
	75	String errorMess age = Real mErrorCont ext.getPro perty(Real mErrorCont ext.realmE rrorContex tException Message);
	76	String exception Class = Re almErrorCo ntext.getP roperty(Re almErrorCo ntext.real mErrorCont extExcepti onName);
	77	logger .debug("au thenticati on failed with error '" + (exc eptionClas s == null ? "<null>" : excepti onClass) + "' and me ssage '" + (errorMes sage == nu ll ? "<nul l>" : erro rMessage) + "'.");
	78	if(err orMessage != null)
	79	response .addHeader (httpHeade rAuthentic ateErrorMe ssage, err orMessage) ;
	80	if(exc eptionClas s != null)
	81	response .addHeader (httpHeade rAuthentic ateErrorNa me, except ionClass);
	82	}
	83	Real mErrorCont ext.unsetR ealmErrorC ontext();
	84	retu rn result;
	85
	86	//re turn true;
	87	}
	88
	89	}