Changeset 6cdcec9f1a8ed87021fe2e899bb2493e80e9f318

Show
Ignore:
Timestamp:
05/30/09 14:39:12 (3 years ago)
Author:
Neutron Soutmun <neo.neutron@…>
Children:
a5bc7d1350ad8579fbd7b9683cdc524a3403f29a
Parents:
4438f09775c39ea8ed73c3d4ee9649e014f40f42, 96808c5450804cf9cc6a590500ccce6131c2b937
git-committer:
Neutron Soutmun <neo.neutron@…> (05/30/09 14:39:12)
Message:

Merge commit 'rahunas-0.1.3.b3' into debian

Files:
19 added
12 modified

Legend:

Unmodified
Added
Removed

  • ChangeLog

    r2c382b4 ra0fbd80  
     12009-05-07  Neutron Soutmun <neo.neutron@gmail.com> 
     2 
     3        * examples/rahunas.init.in: Fix mis-used log_end_msg with the log_action_msg.  
     4 
     52009-05-06  Neutron Soutmun <neo.neutron@gmail.com> 
     6 
     7        * weblogin/squid_helper.php: Handle the virtual server for squid helper. 
     8 
     92009-05-04  Neutron Soutmun <neo.neutron@gmail.com> 
     10 
     11        * +weblogin/ChangeLog: Fork the changelog for weblogin. 
     12 
     132009-04-30  Neutron Soutmun <neo.neutron@gmail.com> 
     14 
     15        * tools/weblogin-config-update.sh.in: Add the updating table nas in database. 
     16 
     172009-04-30  Neutron Soutmun <neo.neutron@gmail.com> 
     18 
     19        * data/rahunas.db: Add table nas into schema. 
     20 
     212009-04-29  Neutron Soutmun <neo.neutron@gmail.com> 
     22 
     23        * example/rahunas.init.in: Fix regenerate/reload weblogin PHP config file. 
     24 
    1252009-04-27  Neutron Soutmun <neo.neutron@gmail.com> 
    226 

  • example/rahunas.init.in

    rf1184f9 ra0fbd80  
    2222WEBLOGIN_CONFIG=@sysconfdir@/rahunas/weblogin-config-update.sh 
    2323NAME=rahunasd 
    24 DESC="RahuNAS - Rahu Network Access Server" 
     24DESC="Rahu Network Access Server" 
    2525 
    2626 
    … …  
    7979 
    8080reload () { 
     81 
     82  $WEBLOGIN_CONFIG 
     83 
    8184  start-stop-daemon --stop --quiet --signal HUP \ 
    8285    --pidfile $PID --name $NAME < /dev/null 
    … …  
    8891case "$1" in 
    8992  start) 
    90     log_daemon_msg "Starting $DESC" "$NAME" 
    91    
    9293    if [ "$RUN_DAEMON" = "yes" ]; then 
     94      log_daemon_msg "Starting $DESC" "$NAME" 
    9395      if start ; then 
    9496        log_end_msg $? 
    … …  
    9799      fi 
    98100    else 
    99       log_end_msg "disabled, to enable see $INIT" 
     101      log_action_msg "Not starting $DESC, as specified in $INIT" 
    100102    fi 
    101103    ;; 
    … …  
    110112    ;; 
    111113  restart) 
    112     log_daemon_msg "Restarting $DESC" "$NAME" 
    113     stop || true 
    114  
    115114    if [ "$RUN_DAEMON" = "yes" ]; then 
     115      log_daemon_msg "Restarting $DESC" "$NAME" 
     116      stop || true 
    116117      if start ; then 
    117118        log_end_msg $? 
    … …  
    120121      fi 
    121122    else 
    122       log_end_msg "disabled, to enable see $INIT" 
     123      log_action_msg "Not restarting $DESC, as specified in $INIT" 
    123124    fi 
    124125    ;; 
    125   reload) 
     126  reload|force-reload) 
    126127    log_daemon_msg "Reloading $DESC" "$NAME" 
    127128     

  • tools/bandwidth.sh.in

    rae7e7e4 r9679928  
    7979      $TC qdisc add dev $SHAPING_DOWN_INF parent 1:${BITTORRENT_ID} \ 
    8080        handle ${BITTORRENT_ID}: sfq perturb 10 
    81       $TC filter add dev $SHAPING_DOWN_INF parent 1: protocol ip prio 5 \ 
     81      $TC filter add dev $SHAPING_DOWN_INF parent 1: protocol ip prio 1 \ 
    8282        handle 0x3 fw classid 1:${BITTORRENT_ID} 
    8383 
    … …  
    8787      $TC qdisc add dev $SHAPING_UP_INF parent 2:${BITTORRENT_ID} \ 
    8888        handle ${BITTORRENT_ID}: sfq perturb 10 
    89       $TC filter add dev $SHAPING_UP_INF parent 2: protocol ip prio 5 \ 
     89      $TC filter add dev $SHAPING_UP_INF parent 2: protocol ip prio 1 \ 
    9090        handle 0x3 fw classid 2:${BITTORRENT_ID} 
    9191      ;; 
    … …  
    143143    classid 1:${ID} htb rate ${DOWNSPEED}bit ceil ${DOWNSPEED}bit 
    144144  $TC filter add dev $SHAPING_DOWN_INF parent 1: \ 
    145     protocol ip prio 1 u32 match ip dst ${IP}/32 flowid 1:${ID} 
     145    protocol ip prio 2 u32 match ip dst ${IP}/32 flowid 1:${ID} 
    146146 
    147147  # Uplink 
    … …  
    149149    classid 2:${ID} htb rate ${UPSPEED}bit ceil ${UPSPEED}bit 
    150150  $TC filter add dev $SHAPING_UP_INF parent 2: \ 
    151     protocol ip prio 1 u32 match ip src ${IP}/32 flowid 2:${ID} 
     151    protocol ip prio 2 u32 match ip src ${IP}/32 flowid 2:${ID} 
    152152} 
    153153 
    … …  
    161161  UP_HANDLE=`$TC filter show dev $SHAPING_UP_INF | grep -w "flowid 2:${ID} " | awk '{print $10}'` 
    162162  $TC filter del dev $SHAPING_DOWN_INF parent 1: \ 
    163     prio 1 handle ${DOWN_HANDLE} u32 
     163    prio 2 handle ${DOWN_HANDLE} u32 
    164164  $TC filter del dev $SHAPING_UP_INF parent 2: \ 
    165     prio 1 handle ${UP_HANDLE} u32 
     165    prio 2 handle ${UP_HANDLE} u32 
    166166 
    167167  # Class Removal 

  • tools/firewall.sh.in

    raace70f r9679928  
    485485  #   bittorrent-announce is customized pattern, warning if not exists. 
    486486  ## 
    487   if [ "$BITTORRENT" = "yes" -o -n "$BITTORRENT_ALLOW" ]; then 
     487  if [ "$BITTORRENT" = "yes" ] || [ -n "$BITTORRENT_ALLOW" ]; then 
    488488    if [ -n "$BITTORRENT_ALLOW" ]; then 
    489489      BITTORRENT_ALLOW_OPTIONS="-m set ! --set $P2P_ALLOW_SET" 
    … …  
    493493      $IPTABLES -t mangle -A $CHAIN_MANGLE_PREROUTING -m layer7 --l7proto bittorrent $BITTORRENT_ALLOW_OPTIONS src -j DROP 
    494494    fi 
    495   else 
     495  elif [ "$BITTORRENT" = "block" ]; then 
    496496      $IPTABLES -t mangle -A $CHAIN_MANGLE_PREROUTING -m layer7 --l7proto bittorrent-announce -j DROP 
    497497      $IPTABLES -t mangle -A $CHAIN_MANGLE_PREROUTING -m layer7 --l7proto bittorrent -j DROP 

  • tools/weblogin-config-update.sh.in

    rca3a480 r71de5a9  
    2121# Main 
    2222MAIN_CONF_DIR=`get_config_value main conf_dir $RAHUNAS_CONFIG` 
     23 
     24# DB 
     25RAHUNAS_DB=/etc/rahunas/rahunas.db 
     26SQLITE3=/usr/bin/sqlite3 
    2327 
    2428generate_config() { 
    … …  
    6872} 
    6973 
     74update_db () { 
     75  file=$1 
     76 
     77  SETNAME=`get_section_name $file` 
     78  VSERVER_ID=`get_config_value $SETNAME vserver_id $file` 
     79  NAS_IDENTIFIER=`get_config_value $SETNAME nas_identifier $file` 
     80 
     81  SQL="REPLACE INTO nas VALUES ('$VSERVER_ID','$NAS_IDENTIFIER')" 
     82  $SQLITE3 $RAHUNAS_DB "$SQL" 
     83} 
     84 
     85clear_nas_db () { 
     86  SQL="DELETE FROM nas" 
     87  $SQLITE3 $RAHUNAS_DB "$SQL" 
     88} 
     89 
    7090destfile="@sysconfdir@/rahunas/config.php" 
    7191if [ "$1" != "" ]; then 
    … …  
    80100  generate_config $file  
    81101done >> $destfile 
     102 
     103clear_nas_db 
     104for file in `find $MAIN_CONF_DIR -name '*.conf'`; 
     105do 
     106  update_db $file 
     107done 

  • weblogin/locale/messages.po

    r1ed3972 r96808c5  
    11# SOME DESCRIPTIVE TITLE. 
    2 # Copyright (C) YEAR Neutron Soutmun 
     2# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER 
    33# This file is distributed under the same license as the PACKAGE package. 
    44# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. 
    … …  
    77msgid "" 
    88msgstr "" 
    9 "Project-Id-Version: RahuNAS Weblogin 0.1.1\n" 
    10 "Report-Msgid-Bugs-To: neo.neutron@gmail.com\n" 
    11 "POT-Creation-Date: 2008-11-27 22:18+0700\n" 
     9"Project-Id-Version: PACKAGE VERSION\n" 
     10"Report-Msgid-Bugs-To: \n" 
     11"POT-Creation-Date: 2009-05-30 13:56+0700\n" 
    1212"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 
    1313"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 
    … …  
    1717"Content-Transfer-Encoding: 8bit\n" 
    1818 
    19 #: ../../weblogin/login.php:115 ../../weblogin/logout.php:100 
     19#: ../index.php:76 
     20msgid "If it is not redirecting within 3 seconds" 
     21msgstr "" 
     22 
     23#: ../index.php:76 
     24msgid "click" 
     25msgstr "" 
     26 
     27#: ../index.php:76 
     28msgid "Login Page" 
     29msgstr "" 
     30 
     31#: ../login.php:153 ../logout.php:139 
    2032msgid "Username" 
    2133msgstr "" 
    2234 
    23 #: ../../weblogin/login.php:117 
     35#: ../login.php:155 
    2436msgid "Password" 
    2537msgstr "" 
    2638 
    27 #: ../../weblogin/login.php:120 
     39#: ../login.php:158 
    2840msgid "Login" 
    2941msgstr "" 
    3042 
    31 #: ../../weblogin/logout.php:104 
     43#: ../logout.php:143 
    3244msgid "Session Start" 
    3345msgstr "" 
    3446 
    35 #: ../../weblogin/logout.php:108 
     47#: ../logout.php:147 
    3648msgid "Session Time" 
    3749msgstr "" 
    3850 
    39 #: ../../weblogin/logout.php:109 
     51#: ../logout.php:148 
    4052msgid "seconds" 
    4153msgstr "" 
    4254 
    43 #: ../../weblogin/logout.php:113 
     55#: ../logout.php:152 
    4456msgid "Expired" 
    4557msgstr "" 
    4658 
    47 #: ../../weblogin/logout.php:114 
     59#: ../logout.php:153 
    4860msgid "Never" 
    4961msgstr "" 
    5062 
    51 #: ../../weblogin/logout.php:118 
     63#: ../logout.php:157 
    5264msgid "Request URL" 
    5365msgstr "" 
    5466 
    55 #: ../../weblogin/logout.php:125 
    56 msgid "Go! Go! Go!" 
     67#: ../logout.php:164 
     68msgid "OK" 
    5769msgstr "" 
    5870 
    59 #: ../../weblogin/logout.php:126 
     71#: ../logout.php:165 
    6072msgid "Logout" 
    6173msgstr "" 
    6274 
    63 #: ../../weblogin/messages.php:3 
     75#: ../messages.php:35 
    6476msgid "Error! Could not connect to the server" 
    6577msgstr "" 
    6678 
    67 #: ../../weblogin/messages.php:4 
     79#: ../messages.php:36 
    6880msgid "Error! Could not connect to the authenticator server" 
    6981msgstr "" 
    7082 
    71 #: ../../weblogin/messages.php:5 
     83#: ../messages.php:37 
    7284msgid "Error! User has been reach the maximum login" 
    7385msgstr "" 
    7486 
    75 #: ../../weblogin/messages.php:6 
     87#: ../messages.php:38 
    7688msgid "Error! User already login" 
    7789msgstr "" 
    7890 
    79 #: ../../weblogin/messages.php:7 
     91#: ../messages.php:39 
    8092msgid "Error! User expired" 
    8193msgstr "" 
    8294 
    83 #: ../../weblogin/messages.php:8 
     95#: ../messages.php:40 
    8496msgid "Error! Invalid IP address" 
    8597msgstr "" 
    8698 
    87 #: ../../weblogin/messages.php:10 
     99#: ../messages.php:42 
    88100msgid "Error! Invalid username or password" 
    89101msgstr "" 
    90102 
    91 #: ../../weblogin/messages.php:11 
     103#: ../messages.php:43 
    92104msgid "Error! Logout failed! please try again" 
    93105msgstr "" 
    94106 
    95 #: ../../weblogin/messages.php:12 
     107#: ../messages.php:44 
    96108msgid "Error! Please login" 
    97109msgstr "" 
    98110 
    99 #: ../../weblogin/messages.php:15 
     111#: ../messages.php:47 
    100112msgid "Success! User has been authorized, please wait a moment" 
    101113msgstr "" 
    102114 
    103 #: ../../weblogin/messages.php:16 
     115#: ../messages.php:48 
    104116msgid "Success! User has been logout" 
    105117msgstr "" 

  • weblogin/locale/th_TH/LC_MESSAGES/messages.po

    r1ed3972 r96808c5  
    44# <neo.neutron@gmail.com>, 2008. 
    55# , fuzzy 
    6 #  
    7 #  
     6# 
     7# 
    88msgid "" 
    99msgstr "" 
    1010"Project-Id-Version: RahuNAS Weblogin 0.1.1\n" 
    11 "Report-Msgid-Bugs-To: neo.neutron@gmail.com\n" 
    12 "POT-Creation-Date: 2008-11-27 22:18+0700\n" 
     11"Report-Msgid-Bugs-To: \n" 
     12"POT-Creation-Date: 2009-05-30 13:56+0700\n" 
    1313"PO-Revision-Date: 2008-11-27 22:47+0700\n" 
    1414"Last-Translator: Neutron Soutmun <neo.neutron@gmail.com>\n" 
    … …  
    1616"MIME-Version: 1.0\n" 
    1717"Content-Type: text/plain; charset=UTF-8\n" 
    18 "Content-Transfer-Encoding: " 
     18"Content-Transfer-Encoding: \n" 
    1919 
    20 #: ../../weblogin/login.php:115 ../../weblogin/logout.php:100 
     20#: ../index.php:76 
     21msgid "If it is not redirecting within 3 seconds" 
     22msgstr "" 
     23 
     24#: ../index.php:76 
     25msgid "click" 
     26msgstr "" 
     27 
     28#: ../index.php:76 
     29#, fuzzy 
     30msgid "Login Page" 
     31msgstr "เข้าสู่ระบบ" 
     32 
     33#: ../login.php:153 ../logout.php:139 
    2134msgid "Username" 
    2235msgstr "ชื่อผู้ใช้" 
    2336 
    24 #: ../../weblogin/login.php:117 
     37#: ../login.php:155 
    2538msgid "Password" 
    2639msgstr "รหัสผ่าน" 
    2740 
    28 #: ../../weblogin/login.php:120 
     41#: ../login.php:158 
    2942msgid "Login" 
    3043msgstr "เข้าสู่ระบบ" 
    3144 
    32 #: ../../weblogin/logout.php:104 
     45#: ../logout.php:143 
    3346msgid "Session Start" 
    3447msgstr "เริ่มวาระ" 
    3548 
    36 #: ../../weblogin/logout.php:108 
     49#: ../logout.php:147 
    3750msgid "Session Time" 
    3851msgstr "เวลาใช้งาน" 
    3952 
    40 #: ../../weblogin/logout.php:109 
     53#: ../logout.php:148 
    4154msgid "seconds" 
    4255msgstr "วินาที" 
    4356 
    44 #: ../../weblogin/logout.php:113 
     57#: ../logout.php:152 
    4558msgid "Expired" 
    4659msgstr "หมดอายุ" 
    4760 
    48 #: ../../weblogin/logout.php:114 
     61#: ../logout.php:153 
    4962msgid "Never" 
    5063msgstr "ไม่มีวันหมดอายุ" 
    5164 
    52 #: ../../weblogin/logout.php:118 
     65#: ../logout.php:157 
    5366msgid "Request URL" 
    5467msgstr "URL ที่ร้องขอ" 
    5568 
    56 #: ../../weblogin/logout.php:125 
    57 msgid "Go! Go! Go!" 
    58 msgstr "ไป! กัน! เลย!" 
     69#: ../logout.php:164 
     70msgid "OK" 
     71msgstr "ตกลง" 
    5972 
    60 #: ../../weblogin/logout.php:126 
     73#: ../logout.php:165 
    6174msgid "Logout" 
    6275msgstr "เลิกใช้งาน" 
    6376 
    64 #: ../../weblogin/messages.php:3 
     77#: ../messages.php:35 
    6578msgid "Error! Could not connect to the server" 
    6679msgstr "ผิดพลาด! ไม่สามารถเชื่อมต่อกับเครื่องแม่ข่ายได้" 
    6780 
    68 #: ../../weblogin/messages.php:4 
     81#: ../messages.php:36 
    6982msgid "Error! Could not connect to the authenticator server" 
    7083msgstr "ผิดพลาด! ไม่สามารถเชื่อมต่อกับเครื่องตรวจสอบสิทธิ์ได้" 
    7184 
    72 #: ../../weblogin/messages.php:5 
     85#: ../messages.php:37 
    7386msgid "Error! User has been reach the maximum login" 
    7487msgstr "ผิดพลาด! ผู้ใช้นี้ทำการเข้าระบบพร้อมกันเกินจำนวนที่กำหนดไว้" 
    7588 
    76 #: ../../weblogin/messages.php:6 
     89#: ../messages.php:38 
    7790msgid "Error! User already login" 
    7891msgstr "ผิดพลาด! ผู้ใช้นี้ได้เข้าระบบแล้ว" 
    7992 
    80 #: ../../weblogin/messages.php:7 
     93#: ../messages.php:39 
    8194msgid "Error! User expired" 
    8295msgstr "ผิดพลาด! ผู้ใช้นี้หมดอายุลงแล้ว" 
    8396 
    84 #: ../../weblogin/messages.php:8 
     97#: ../messages.php:40 
    8598msgid "Error! Invalid IP address" 
    8699msgstr "ผิดพลาด! IP address ไม่ถูกต้อง" 
    87100 
    88 #: ../../weblogin/messages.php:10 
     101#: ../messages.php:42 
    89102msgid "Error! Invalid username or password" 
    90103msgstr "ผิดพลาด! ชื่อผู้ใช้ หรือ รหัสผ่าน ไม่ถูกต้อง" 
    91104 
    92 #: ../../weblogin/messages.php:11 
     105#: ../messages.php:43 
    93106msgid "Error! Logout failed! please try again" 
    94107msgstr "ผิดพลาด! ไม่สามารถเลิกใช้งานได้ กรุณาลองใหม่อีกครั้ง" 
    95108 
    96 #: ../../weblogin/messages.php:12 
     109#: ../messages.php:44 
    97110msgid "Error! Please login" 
    98111msgstr "ผิดพลาด! กรุณาเข้าสู่ระบบ" 
    99112 
    100 #: ../../weblogin/messages.php:15 
     113#: ../messages.php:47 
    101114msgid "Success! User has been authorized, please wait a moment" 
    102115msgstr "สำเร็จ! ผู้ใช้นี้ผ่านการตรวจสอบ กรุณารอสักครู่" 
    103116 
    104 #: ../../weblogin/messages.php:16 
     117#: ../messages.php:48 
    105118msgid "Success! User has been logout" 
    106119msgstr "สำเร็จ! ผู้ใช้นี้ ได้เลิกใช้งานแล้ว" 
    107120 
     121#~ msgid "Go! Go! Go!" 
     122#~ msgstr "ไป! กัน! เลย!" 

  • weblogin/logout.php

    rd5429ac r96808c5  
    162162  " <tr>" . 
    163163  "   <td>&nbsp;<input type='hidden' name='do_logout' value='yes'></td>" . 
    164   "   <td><input type='button' value='" . _("Go! Go! Go!") . "' id='rh_goto_button' onClick='window.open(\"".$request_url."\");'></td>" . 
     164  "   <td><input type='button' value='" . _("OK") . "' id='rh_goto_button' onClick='window.open(\"".$request_url."\");'></td>" . 
    165165  "   <td><input type='submit' value='" . _("Logout") . "' id='rh_logout_button'></td>" . 
    166166  " </tr>" . 

  • weblogin/rahu_radius.class.php

    r33c7588 r15110c7  
    190190    $randno3 = rand(0,65535); 
    191191    $randno4 = rand(0,65535); 
    192     $randno = sprintf("%s%s%s%s", dechex($randno1), dechex($randno2), 
    193                                     dechex($randno3), dechex($randno4)); 
     192    $randno = sprintf("%s%s%s%s",  
     193                str_pad(dechex($randno1), 4, "0", STR_PAD_LEFT),  
     194                str_pad(dechex($randno2), 4, "0", STR_PAD_LEFT),  
     195                str_pad(dechex($randno3), 4, "0", STR_PAD_LEFT),  
     196                str_pad(dechex($randno4), 4, "0", STR_PAD_LEFT)); 
    194197    $this->session_id = $randno; 
    195198                                                      

  • weblogin/squid_helper.php

    r59f8607 ra68d42f  
    3333include_once 'config.php'; 
    3434require_once 'rahu_xmlrpc.class.php'; 
     35require_once 'networkchk.php'; 
    3536 
    3637define(CACHE_TIME, 120); 
    … …  
    4647  $srcip = rawurldecode($arg); 
    4748 
     49  $config = get_config_by_network(trim($srcip), $config_list); 
     50  $vserver_id = $config["VSERVER_ID"]; 
     51 
    4852  // Check cache 
    49   if (!empty($user_list[$srcip]['username']) &&  
    50     (time() - $user_list[$srcip]['timestamp']) < CACHE_TIME) { 
    51     fwrite(STDOUT, "OK user=". $user_list[$srcip]['username']  ."\n"); 
     53  if (!empty($user_list[$vserver_id][$srcip]['username']) &&  
     54    (time() - $user_list[$vserver_id][$srcip]['timestamp']) < CACHE_TIME) { 
     55    fwrite(STDOUT, "OK user=". $user_list[$vserver_id][$srcip]['username']  ."\n"); 
    5256    continue; 
    5357  } 
    … …  
    5761  $xmlrpc->port = $config["RAHUNAS_PORT"]; 
    5862  try { 
    59     $retinfo = $xmlrpc->do_getsessioninfo($srcip); 
     63    $retinfo = $xmlrpc->do_getsessioninfo($vserver_id, $srcip); 
    6064    if (is_array($retinfo) && !empty($retinfo['session_id'])) { 
    61       $user_list[$srcip]['username'] = $retinfo['username'];       
    62       $user_list[$srcip]['timestamp'] = time();       
     65      $user_list[$vserver_id][$srcip]['username'] = $retinfo['username'];       
     66      $user_list[$vserver_id][$srcip]['timestamp'] = time();       
    6367      fwrite(STDOUT, "OK user=". $retinfo['username']  ."\n"); 
    6468    } else {