I've been trying to find that particular story, but it's not in my favorites, for whatever reason. This link has a really similar story, same idea, but Sherlock is too preoccupied with John to go beat the guy to a pulp; I'll let you find out what he does instead