Save no session by default (kyuridenamida#38)

kyuridenamida · web-flow · commit 2cbbed367602 · 2018-12-26T07:22:14.000+09:00
* Save no session by default
diff --git a/atcodertools/client/atcoder.py b/atcodertools/client/atcoder.py
@@ -25,6 +25,7 @@ def save_cookie(session: requests.Session, cookie_path: Optional[str] = None):
     cookie_path = cookie_path or default_cookie_path
     os.makedirs(os.path.dirname(cookie_path), exist_ok=True)
     session.cookies.save()
+    logging.info("Saved session into {}".format(os.path.abspath(cookie_path)))
     os.chmod(cookie_path, 0o600)
 
 
@@ -33,6 +34,8 @@ def load_cookie_to(session: requests.Session, cookie_path: Optional[str] = None)
     session.cookies = LWPCookieJar(cookie_path)
     if os.path.exists(cookie_path):
         session.cookies.load()
+        logging.info(
+            "Loaded session from {}".format(os.path.abspath(cookie_path)))
         return True
     return False
 
@@ -57,7 +60,7 @@ def check_logging_in(self):
         resp = self._request(private_url)
         return resp.url == private_url
 
-    def login(self, username=None, password=None, use_local_session_cache=True):
+    def login(self, username=None, password=None, use_local_session_cache=True, save_session_cache=True):
         if use_local_session_cache:
             load_cookie_to(self._session)
             if self.check_logging_in():
@@ -82,7 +85,7 @@ def login(self, username=None, password=None, use_local_session_cache=True):
         if resp.text.find("パスワードを忘れた方はこちら") != -1:
             raise LoginError
 
-        if use_local_session_cache:
+        if use_local_session_cache and save_session_cache:
             save_cookie(self._session)
 
     def download_problem_list(self, contest: Contest) -> List[Problem]:
diff --git a/atcodertools/tools/envgen.py b/atcodertools/tools/envgen.py
@@ -229,6 +229,11 @@ def main(prog, args):
                         help="Prepare problem directories one by one not using multi processors.",
                         default=False)
 
+    parser.add_argument("--save-no-session-cache",
+                        action="store_true",
+                        help="Save no session cache to avoid security risk",
+                        default=False)
+
     args = parser.parse_args(args)
 
     try:
@@ -241,7 +246,7 @@ def main(prog, args):
     client = AtCoderClient()
     if not args.without_login:
         try:
-            client.login()
+            client.login(save_session_cache=not args.save_no_session_cache)
             logging.info("Login successful.")
         except LoginError:
             logging.error(
