I've said it before, will say it again: The Leaker was Colin Powell. He was the odd-man out in the Admin's 1st term and he's the only one, beside Armitage who's not in the second. The leak came from State.
How tight is Woodward with Powell? I don't trust Armitage, but he wasn't in the Whitehouse and this leak is said to come from the Whitehouse and not been Libby or Rove -- which leads me to think Card.