Produced by Araxis Merge on 7/10/2017 1:01:42 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.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | C:\AraxisMergeCompare\Pri_un\IV-ehmp_cif\AWIVWebApp\main\src\java\gov\va\med\imaging\awiv\webservices\commands | AbstractAwivGetElectronicSignatureCommand.java | Thu Jun 29 17:22:12 2017 UTC |
| 2 | C:\AraxisMergeCompare\Pri_re\IV-ehmp_cif\AWIVWebApp\main\src\java\gov\va\med\imaging\awiv\webservices\commands | AbstractAwivGetElectronicSignatureCommand.java | Fri Jul 7 16:34:55 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 3 | 250 |
| Changed | 2 | 4 |
| Inserted | 0 | 0 |
| Removed | 0 | 0 |
| 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 |
No regular expressions were active.
| 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: Sep 10, 2012 | |
| 6 | Site Nam e: Washin gton OI Fi eld Office , Silver S pring, MD | |
| 7 | Developer:
|
|
| 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.i maging.awi v.webservi ces.comman ds; | |
| 27 | ||
| 28 | import jav a.util.Has hMap; | |
| 29 | import jav a.util.Map ; | |
| 30 | ||
| 31 | import gov .va.med.ex ceptions.R outingToke nFormatExc eption; | |
| 32 | import gov .va.med.im aging.awiv .AWIVRoute r; | |
| 33 | import gov .va.med.im aging.core .interface s.exceptio ns.Connect ionExcepti on; | |
| 34 | import gov .va.med.im aging.core .interface s.exceptio ns.MethodE xception; | |
| 35 | import gov .va.med.im aging.encr yption.Aes Encryption ; | |
| 36 | import gov .va.med.im aging.encr yption.exc eptions.Ae sEncryptio nException ; | |
| 37 | import gov .va.med.im aging.exch ange.Routi ngTokenHel per; | |
| 38 | import gov .va.med.im aging.exch ange.busin ess.Electr onicSignat ureResult; | |
| 39 | import gov .va.med.im aging.web. commands.W ebserviceI nputParame terTransac tionContex tField; | |
| 40 | ||
| 41 | /** | |
| 42 | * @author
|
|
| 43 | * | |
| 44 | */ | |
| 45 | public abs tract clas s Abstract AwivGetEle ctronicSig natureComm and<E exte nds Object > | |
| 46 | extends Ab stractAwiv Webservice Command<El ectronicSi gnatureRes ult, E> | |
| 47 | { | |
| 48 | pr ivate fina l String s iteId; | |
| 49 | pr ivate fina l String e lectronicS ignature; | |
| 50 | ||
| 51 | pu blic Abstr actAwivGet Electronic SignatureC ommand(Str ing siteId , String e lectronicS ignature) | |
| 52 | { | |
| 53 | supe r("checkEl ectronicSi gnature"); | |
| 54 | this .siteId = siteId; | |
| 55 | this .electroni cSignature = electro nicSignatu re; | |
| 56 | } | |
| 57 | ||
| 58 | /* * | |
| 59 | * @return t he siteId | |
| 60 | * / | |
| 61 | pu blic Strin g getSiteI d() | |
| 62 | { | |
| 63 | retu rn siteId; | |
| 64 | } | |
| 65 | ||
| 66 | /* * | |
| 67 | * @return t he electro nicSignatu re | |
| 68 | * / | |
| 69 | pu blic Strin g getElect ronicSigna ture() | |
| 70 | { | |
| 71 | retu rn electro nicSignatu re; | |
| 72 | } | |
| 73 | ||
| 74 | /* (non-Java doc) | |
| 75 | * @see gov. va.med.ima ging.web.c ommands.Ab stractWebs erviceComm and#execut eRouterCom mand() | |
| 76 | * / | |
| 77 | @O verride | |
| 78 | pr otected El ectronicSi gnatureRes ult execut eRouterCom mand() | |
| 79 | throws MethodExc eption, Co nnectionEx ception | |
| 80 | { | |
| 81 | AWIV Router rou ter = getR outer(); | |
| 82 | try | |
| 83 | { | |
| 84 | // the electroni c signatur e here is encrypted so it must be decode d before p assing to the comman d | |
| 85 | ||
| 86 | String decrypted Electronic Signature = AesEncry ption.deco deByteArra y(getElect ronicSigna ture()); | |
| 87 | ||
| 88 | return router.ve rifyElectr onicSignat ure( | |
| 89 | RoutingTok enHelper.c reateSiteA ppropriate RoutingTok en(getSite Id()), | |
| 90 | decryptedE lectronicS ignature); | |
| 91 | } | |
| 92 | catc h (Routing TokenForma tException rtfX) | |
| 93 | { | |
| 94 | throw new Method Exception( "RoutingTo kenFormatE xception, unable to check elec tronic sig nature", r tfX); | |
| 95 | } | |
| 96 | catc h(AesEncry ptionExcep tion aeseX ) | |
| 97 | { | |
| 98 | throw new Method Exception( "Unable to decrypt e lectronic signature, " + aeseX .getMessag e(), aeseX ); | |
| 99 | } | |
| 100 | } | |
| 101 | ||
| 102 | /* (non-Java doc) | |
| 103 | * @see gov. va.med.ima ging.web.c ommands.Ab stractWebs erviceComm and#getMet hodParamet erValuesSt ring() | |
| 104 | * / | |
| 105 | @O verride | |
| 106 | pr otected St ring getMe thodParame terValuesS tring() | |
| 107 | { | |
| 108 | retu rn "from s ite '" + g etSiteId() + "'."; | |
| 109 | } | |
| 110 | ||
| 111 | /* (non-Java doc) | |
| 112 | * @see gov. va.med.ima ging.web.c ommands.Ab stractWebs erviceComm and#getTra nsactionCo ntextField s() | |
| 113 | * / | |
| 114 | @O verride | |
| 115 | pr otected Ma p<Webservi ceInputPar ameterTran sactionCon textField, String> g etTransact ionContext Fields() | |
| 116 | { | |
| 117 | Map< Webservice InputParam eterTransa ctionConte xtField, S tring> tra nsactionCo ntextField s = | |
| 118 | new Ha shMap<Webs erviceInpu tParameter Transactio nContextFi eld, Strin g>(); | |
| 119 | ||
| 120 | tran sactionCon textFields .put(Webse rviceInput ParameterT ransaction ContextFie ld.quality , transact ionContext NaValue); | |
| 121 | tran sactionCon textFields .put(Webse rviceInput ParameterT ransaction ContextFie ld.urn, tr ansactionC ontextNaVa lue); | |
| 122 | tran sactionCon textFields .put(Webse rviceInput ParameterT ransaction ContextFie ld.queryFi lter, tran sactionCon textNaValu e); | |
| 123 | ||
| 124 | retu rn transac tionContex tFields; | |
| 125 | } | |
| 126 | ||
| 127 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.