mod_spam_filter: Return error for presence spam
Also return an error stanza for rejected presence spam, not just for rejected messages.
This commit is contained in:
		
							parent
							
								
									e6249c41e2
								
							
						
					
					
						commit
						05a5f002a3
					
				@ -485,12 +485,15 @@ reject(#message{from = From, to = To, type = Type, lang = Lang} = Msg)
 | 
				
			|||||||
       Type /= error ->
 | 
					       Type /= error ->
 | 
				
			||||||
    ?INFO_MSG("Rejecting unsolicited message from ~s to ~s",
 | 
					    ?INFO_MSG("Rejecting unsolicited message from ~s to ~s",
 | 
				
			||||||
	      [jid:encode(From), jid:encode(To)]),
 | 
						      [jid:encode(From), jid:encode(To)]),
 | 
				
			||||||
    Txt = <<"Your traffic is unsolicited">>,
 | 
					    Txt = <<"Your message is unsolicited">>,
 | 
				
			||||||
    Err = xmpp:err_policy_violation(Txt, Lang),
 | 
					    Err = xmpp:err_policy_violation(Txt, Lang),
 | 
				
			||||||
    ejabberd_router:route_error(Msg, Err);
 | 
					    ejabberd_router:route_error(Msg, Err);
 | 
				
			||||||
reject(#presence{from = From, to = To}) ->
 | 
					reject(#presence{from = From, to = To, lang = Lang} = Presence) ->
 | 
				
			||||||
    ?INFO_MSG("Rejecting unsolicited presence from ~s to ~s",
 | 
					    ?INFO_MSG("Rejecting unsolicited presence from ~s to ~s",
 | 
				
			||||||
	      [jid:encode(From), jid:encode(To)]);
 | 
						      [jid:encode(From), jid:encode(To)]),
 | 
				
			||||||
 | 
					    Txt = <<"Your traffic is unsolicited">>,
 | 
				
			||||||
 | 
					    Err = xmpp:err_policy_violation(Txt, Lang),
 | 
				
			||||||
 | 
					    ejabberd_router:route_error(Presence, Err);
 | 
				
			||||||
reject(_) ->
 | 
					reject(_) ->
 | 
				
			||||||
    ok.
 | 
					    ok.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user