comparison OrthancServer/Internals/CommandDispatcher.cpp @ 2352:3ab96768d144

Fix issue #52 (DICOM level security association problems)
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 18 Jul 2017 17:33:26 +0200
parents a3a65de1840f
children b8969010b534
comparison
equal deleted inserted replaced
2351:56504f89d4ac 2352:3ab96768d144
804 } 804 }
805 805
806 806
807 // Check whether this request is allowed by the security filter 807 // Check whether this request is allowed by the security filter
808 if (supported && 808 if (supported &&
809 request != DicomRequestType_Echo && // Always allow incoming ECHO requests
810 filter_ != NULL && 809 filter_ != NULL &&
811 !filter_->IsAllowedRequest(remoteIp_, remoteAet_, calledAet_, request)) 810 !filter_->IsAllowedRequest(remoteIp_, remoteAet_, calledAet_, request))
812 { 811 {
813 LOG(ERROR) << EnumerationToString(request) 812 LOG(WARNING) << "Rejected " << EnumerationToString(request)
814 << " requests are disallowed for the AET \"" 813 << " request from remote DICOM modality with AET \""
815 << remoteAet_ << "\""; 814 << remoteAet_ << "\" and hostname \"" << remoteIp_ << "\"";
816 cond = DIMSE_ILLEGALASSOCIATION; 815 cond = DIMSE_ILLEGALASSOCIATION;
817 supported = false; 816 supported = false;
818 finished = true; 817 finished = true;
819 } 818 }
820 819
904 LOG(INFO) << "Association Aborted"; 903 LOG(INFO) << "Association Aborted";
905 } 904 }
906 else 905 else
907 { 906 {
908 OFString temp_str; 907 OFString temp_str;
909 LOG(ERROR) << "DIMSE failure (aborting association): " << cond.text(); 908 LOG(INFO) << "DIMSE failure (aborting association): " << cond.text();
910 /* some kind of error so abort the association */ 909 /* some kind of error so abort the association */
911 ASC_abortAssociation(assoc_); 910 ASC_abortAssociation(assoc_);
912 } 911 }
913 } 912 }
914 913