I wonder if it can be challenged in ICJ, if any of the countries previously considered safe would follow it to the letter regarding mass surveillance. As for security research and whistleblowing, that may be covered by laws as legitimate activities making them outside of the scope (and that would be much better approach).
