So we fight for liberty and privacy but blame the ones that risk their lives bringing it. I fear these attacks will convince everyone that mass surveillance is a necessary thing.

Surprisingly, you only need a few terrorists to change international laws and double those military budgets. Snowden or not, it's the virus that comes first and the anti-virus after. I don't think any mass surveillance program can stop such actions unless you become a militia state which I highly doubt (and hope not) will ever happen.