Moved from wget to curl, because wget mangle the cookies starting with double quotes...

Bumped standard version

diff --git a/ccoop-update b/ccoop-update
index ffb7960..47756ff 100755 (executable)
--- a/ccoop-update
+++ b/ccoop-update
@@ -10,7 +10,7 @@
 set -e
 
 export CCPATH=~/ccoop
-LOGFILE=$CCPATH/coop.log # unsued unless --log option is used
+LOGFILE=$CCPATH/ccoop.log # unsued unless --log option is used
 COOKIEJAR=$CCPATH/cookiejar # cookies, deleted on exit
 TMP=$CCPATH/lastpage.html # last html page, deleted on exit
 
@@ -84,7 +84,7 @@ function inform() {
 }
 
 function fetch() {
-    wget -q --load-cookies $COOKIEJAR --save-cookies $COOKIEJAR --keep-session-cookies $@ -O - | iconv -f ISO-8859-1 -t UTF-8 > $TMP
+    curl --cookie  $COOKIEJAR --cookie-jar $COOKIEJAR --location "$@" | iconv -f ISO-8859-1 -t UTF-8 > $TMP
     if [ -n "$log" ]; then
         cat $TMP >> $LOGFILE
     fi
@@ -136,22 +136,17 @@ function fetchall() {
         echo> $LOGFILE
     fi
     
-    inform "WGET login form"
-    fetch https://www.coopanet.com/banque/sso/ssologin.do
-    
-    inform "WGET /banque/sso/co/connexion.do"
-    fetch "--post-data=site=C&codeUtil=$COOPLOGIN&motPasse=$COOPPASSWORD&pbValider=Valider" https://www.coopanet.com/banque/sso/co/connexion.do
-    
-    inform "WGET banque/cpt/incoopanetj2ee.do"
-    fetch https://www.coopanet.com/banque/cpt/incoopanetj2ee.do
- 
-    if grep -q "Vous venez de quitter  COOP@NET" $TMP; then
+    inform "CURL /banque/sso/co/connexionsec.do"
+    fetch --data "codeUtil=$COOPLOGIN&motPasse=$COOPPASSWORD&identType=MDP&pbValider=Valider" https://www.coopanet.com/banque/sso/co/connexionsec.do
+
+    if grep -q "Choisissez votre mode d" $TMP; then
         echo "Can't log in. Check password" >&2
+        exit 1
     fi
 
     IFS=$'\n'
-    accountsId=(`grep numeroExterne $TMP | grep hidden | cut -d \" -f 8`)
-    ccountsNames=(`grep "<TD class=txt width=\"99%\">" $TMP |  cut -d \> -f 6  | cut -d "<" -f 1`)
+    accountsId=(`grep numeroExterne $TMP | grep hidden | cut -d \" -f 14`)
+    accountsNames=(`grep "<TD class=txt width=\"99%\">" $TMP |  cut -d \> -f 6  | cut -d "<" -f 1`)
     accountsBalances=(`grep "Consulter votre relevé" $TMP | cut -d ">" -f 3 | cut -d "<" -f 1`)
     unset IFS
 
@@ -161,23 +156,23 @@ function fetchall() {
         balance=${accountsBalances[$idx]}
         inform "$name $account $balance"
     
-        inform "WGET situationcomptes.do"
-        fetch "--post-data=numeroExterne=$account&typeAction=2&btAction=OK" https://www.coopanet.com/banque/cpt/cpt/situationcomptes.do
+        inform "CURL situationcomptes.do"
+        fetch --data "numeroExterne=$account&typeAction=2&btAction=OK" https://www.coopanet.com/banque/cpt/cpt/situationcomptes.do
         
         dateFin=`grep dateFin $TMP | cut -d \" -f 10`
-        inform "WGET selectiontelechargement.do"
-        fetch "--post-data=format=3&dateDebut=01/01/2001&dateFin=$dateFin&btValider=Valider" https://www.coopanet.com/banque/cpt/cpt/selectiontelechargement.do
+        inform "CURL selectiontelechargement.do"
+        fetch --data "format=3&dateDebut=01/01/2001&dateFin=$dateFin&btValider=Valider" https://www.coopanet.com/banque/cpt/cpt/selectiontelechargement.do
     
-        inform "WGET telechargement.do"
+        inform "CURL telechargement.do"
         ppath=`grep path $TMP | cut -d \" -f 6`
-        fetch "--post-data=path=$ppath&zip=2&btConfirmer=Confirmer" https://www.coopanet.com/banque/cpt/cpt/telechargement.do
+        fetch --data "path=$ppath&zip=2&btConfirmer=Confirmer" https://www.coopanet.com/banque/cpt/cpt/telechargement.do
         tail -n +2 $TMP > $CCPATH/$account.`date +%Y%m%d`.csv
         rm -f $CCPATH/$account.last.csv
         ln -s $CCPATH/$account.`date +%Y%m%d`.csv $CCPATH/$account.last.csv
     done
     
     # logout
-    inform "WGET /banque/sso/ssologout.do"
+    inform "CURL /banque/sso/ssologout.do"
     fetch https://www.coopanet.com/banque/sso/ssologout.do
     
     # delete tmp files

diff --git a/debian/changelog b/debian/changelog
index 6391024..29eebc4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ccoop (0.4) UNRELEASED; urgency=low
+
+  * Moved from wget to curl, because wget mangle the cookies starting with
+    double quotes (SSOCOOKIECC)
+  * Bumped standard version
+
+ -- Jean-Michel Vourgère <jmv_deb@nirgal.com>  Thu, 24 Jun 2010 15:59:51 +0100
+
 ccoop (0.3) UNRELEASED; urgency=low
 
   * Fix for new login/logout procedure

diff --git a/debian/control b/debian/control
index a3f3cb0..1d56523 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,12 @@ Section: misc
 Priority: optional
 Maintainer: Jean-Michel Vourgère <jmv_deb@nirgal.com>
 Build-Depends: debhelper (>> 3.0.0)
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 
 Package: ccoop
 Section: misc
 Architecture: all
-Depends: python
+Depends: python, curl
 Suggests: liferea
 Description: Tools for accounts at bank Crédit Coopératif
  That tool daily fetch a csv file via https from coopanet web site and merges