A laundry list of specific criteria, while certainly beloved of lawyers, would be both too permissive and too limiting. The sample criteria includes such concepts as a nation's honor--which could be stretched to apply to some very dubious situations. At the same time, a specific set of criteria as proposed will never cover all situations. Classic just war theory remains appropriate.
This is horse-pucky.
The US was unilaterally attacked and 3000 of its citizens killed on 9/11. Members of the same terrorist group had bombed at a minimum, 2 of our embassies, one of our barracks, and one of our warships.
The US acted in self-defense and continues to do so. The statement included anyone who aided, abetted, harbored, or were in any way complict with the terrorists.
Iraq fits those criteria. (So does Syria, Iran, North Korea, Saudi Arabia, Yemen, Sudan, Somalia,....)